Micro fix Jasper
# 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: ed982e5957df97237c86905fe3c3800d65a76751 # timestamp: 2008-08-04 22:45:34 +0200 # source_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk # base_revision_id: [EMAIL PROTECTED] # # Begin patch === modified file 'olive/__init__.py' --- olive/__init__.py 2008-08-03 10:07:38 +0000 +++ olive/__init__.py 2008-08-04 20:45:30 +0000 @@ -532,7 +532,7 @@ @show_bzr_error def on_menuitem_branch_update_activate(self, widget): - """ Brranch/checkout update menu handler. """ + """ Branch/checkout update menu handler. """ ret = self.wt.update() conflicts = self.wt.conflicts() @@ -540,6 +540,7 @@ info_dialog(_i18n('Update successful but conflicts generated'), _i18n('Number of conflicts generated: %d.') % (len(conflicts),) ) else: info_dialog(_i18n('Update successful'), _i18n('No conflicts generated.') ) + self.refresh_right() def on_menuitem_branch_push_activate(self, widget): """ Branch/Push... menu handler. """
# Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZYgR2wAAX5fgAQQUWP//1KQ ggC////wUAOe6ABoqhrhKUamm0mamjQYTE0GjRoAADDQ0AAAGgAAAABppNRPJAA00GgANAAAMNDQ AAAaAAAAAEkgQNNJqeE1NJ4k2plPTRPE0j1HkcTptKx3pH0NcSKYZXM+pnPQZ26aw1jVQUDKc8Dv lJKNvA8NGRUNoq5Rfh3ofIo5xffXF0QLPUDkQIOdr+ndN2NjOKYNtUb+XeiOeb0j2li3djyV5se2 /It9kwq6Clz2eRA/S/S7NxnY07/JERXjXbhObgGLCOo4FQh4oFS4NAQwhxIgql7HbA+6/yaUCXQ7 qHa0GxoeauMU82MXjf07wxX0kMxMmacZ1MWshOFFdhvkbysxIAxkKuUCsVvguqNCUkxLKBYfWJuG SrLFYwm1HChbzV0ChWSPcDfcbYtsUPOGponC7EWFd5XCOJaUmQwWBuqJGaslO13CZQl1z3Wrt2Py LlmscLM5m4ERnhJRhLLPBiUCg47BRORwJ2zc1t5xHGBVYcsTreKlhcb2GL0+4uCPIt8jZhfhjaJE walB3R4cfM+3c+TiTOfWugDybDHrzc0mw8FgoXtXNQing+eJGjcE80GMBxmanzkBretDKhEKlZxG SgtxhIpzmL9+6vDpr45HUSTjMjH6gN550NBnIQJiwrK1kZNUtuKHm4Qo1TtSVHYrBHyaemxOo1Fg jUtDMscVz+Dl8dY5zvbidC98zvV5Z338zzKt7SvgGR0iNnh9ll34qzSOiZGGuGGuT4prpBqVkUwG ck/O3cbHkfkNTQmefLi3QWDlvKH06ZJsRVA/hTxshMcg20DIFMwBH9JzvEYuKDHSkckBRSsLq17S F1wlzXUBQC+i5OINwXjoaEsAzE+wBa2hHk1EGkDMEdFr0Xx1QHC6lLJ0cQWpLZWGSqBe81L6ovBk riRAGfF/4ZfsB4OYTIOPMTluOAH0Z4G0EdoWKteL1O3e/LcaaZruXxWqjlcE4WWDUVDxF8i12YNm DyAmDev2hbUK0n4aUZPuVdg5a/L+oIkWGW4B0hmyPlfHXEYsOIDVLGJBoobmhN0yT6YxIlFgQZFm rOlD7eYODwIJiKMUpqFzoQvvP0sPe260rXobwPW49R+x5i4gPWOnJOc2S1oTW5q34u5IpwoSEsQI 7YA=
signature.asc
Description: OpenPGP digital signature
-- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
