[Pkg-bazaar-commits] ./bzr-gtk/unstable r594: Merge of small tweak: update Olive file list after branch update
Jasper Groenewegen
colbrac at xs4all.nl
Fri Apr 10 07:44:29 UTC 2009
------------------------------------------------------------
revno: 594
committer: Jasper Groenewegen <colbrac at xs4all.nl>
branch nick: trunk
timestamp: Mon 2008-08-04 22:59:00 +0200
message:
Merge of small tweak: update Olive file list after branch update
modified:
olive/__init__.py
------------------------------------------------------------
revno: 592.1.1
committer: Jasper Groenewegen <colbrac at xs4all.nl>
branch nick: updaterefresh
timestamp: Mon 2008-08-04 22:45:30 +0200
message:
Update Olive file list after update
modified:
olive/__init__.py
-------------- next part --------------
=== modified file 'olive/__init__.py'
--- a/olive/__init__.py 2008-08-03 10:07:38 +0000
+++ b/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. """
More information about the Pkg-bazaar-commits
mailing list