This patch fixes a traceback when the rename dialog is to be displayed. This fixes the import source for show_bzr_error.
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [EMAIL PROTECTED] # target_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk # testament_sha1: 90191493834788cc1f9932f1de2f305fabe30edf # timestamp: 2008-07-14 14:48:24 -0400 # source_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk # base_revision_id: [EMAIL PROTECTED] # # Begin patch === modified file 'olive/rename.py' --- olive/rename.py 2008-05-05 18:16:46 +0000 +++ olive/rename.py 2008-07-14 18:48:05 +0000 @@ -28,7 +28,7 @@ import bzrlib.errors as errors from bzrlib.workingtree import WorkingTree -from errors import show_bzr_error +from bzrlib.plugins.gtk.errors import show_bzr_error from bzrlib.plugins.gtk.dialog import error_dialog from guifiles import GLADEFILENAME from bzrlib.plugins.gtk import _i18n # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfMm/+8AAXZfgAAQUWv//1IA BEC////wUAOZPDp107ae5ZwkomgJplPaTI00ynpPUPU9TTSepowCSk0noZU/JlNqmTRk0aAB6gAD TRTEk9PVM00NAI0YEZp6gAMUTTTSGmgDIAADQAAkkEDQamjU9qUeU9IeTUeUMgGXI4pGz0KXTIoK QNUa2pcAKoVs0cM/WFI1wJIlwR8zyCSCOtXNYf6WcJR9SndM0XNPlWDLIh7lFBD+TUT7+WnDdQ6J 2LGQ6ibbNAIdkbPi4q3z0FdqmFSLmYSYOXF7ZXz8Pq5fDlYcXwewXMf6xoqGdzHXoXE6JiVcStcP QOeIYcVGsDA9zztJGAzrIJU2jkvz6ikuOOWLNqegxmLcZV7isYHRm8+l2guJI6jyYrLa7xJjMNxg uqveaxtGCuRsHjz1otIaVmh5ZPIswDG8cXjYjReLmStIkSRpvFvVrqz0i+Nhc4csdZjgPFliV0Xw BhVUsshAvTiwnOSif3arhEvAmaFmRguv/vyjabRXgow2OMB4pcBUNOXgW6mzAuebRikMbLjIqOmR UcdpK+wjNhiKfeWBFuBs+xEhOJC1lwtqarl1UmOfoN38zlDyrWvi0ihKHISexMP5zKySssQ6XKGD b/FbiId7pxlxoXlQdvJuZBTSpi1nE/smzT5z5mARruyLcjDn9DsQzPEg9ZTdryOF1fEqHW+Is1ji UPE8ySimtRyJFoS4DZ7FTPh8fNpuuqUcyJ3OA9/cuIEAyLM9XGZfKjYQDLV7U+p3Oe3o82xP1QaL kTEYUnRd3A9N4Z9JBXJ8AHpsqjDSbyU7Z5nXUWEAP6xXQ+dS9lWHMVAGn/n3aMzZgF33PB0DoBmq yuc7nZ8kRIkQJ71A8F2CV/+9745VslnBkBtyoNpG2QXlaVr0sUPoWBH8/4amYzrwx0cqfem8DMzM dFxg+/KbrthJdiaIhVWVJyjivHHITHUsOrAWETh7gIknMcAkQjHiqNiZS0NySECppMFAChNTclap cCzTGJWtU3QXhti0hsoJ7xlyuThX6mTZxmOqwMhtoZu301yZnxCn2OcxNeo4UUrVKPi6gbFAvKCQ RUzaRwilCVcczSawnEgAZGWPO0o9wXo176KCvpk4hSquHubTURsr2DSKMU0DQlV/N0CjYq5oDt07 06y+eyUmUiiA/r3lF6YXi/BTEi4CfLImuboLXMoJ3cuLqLc8XsLuSKcKEh5k3/3g
-- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
