[Pkg-bazaar-commits] ./bzr-gtk/unstable r548: Merge fix for regression in merge.
Jelmer Vernooij
jelmer at samba.org
Fri Apr 10 07:50:40 UTC 2009
------------------------------------------------------------
revno: 548
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-07-18 13:06:07 +0200
message:
Merge fix for regression in merge.
modified:
olive/__init__.py
------------------------------------------------------------
revno: 533.2.3
committer: Jasper Groenewegen <colbrac at xs4all.nl>
branch nick: mergedialog
timestamp: Fri 2008-07-18 13:00:53 +0200
message:
MergeDialog: Point to right location again.
modified:
olive/__init__.py
-------------- next part --------------
=== modified file 'olive/__init__.py'
--- a/olive/__init__.py 2008-07-18 10:38:13 +0000
+++ b/olive/__init__.py 2008-07-18 11:06:07 +0000
@@ -547,7 +547,7 @@
def on_menuitem_branch_merge_activate(self, widget):
""" Branch/Merge... menu handler. """
- from bzrlib.plugins.gtk.olive.merge import MergeDialog
+ from bzrlib.plugins.gtk.merge import MergeDialog
if self.check_for_changes():
error_dialog(_i18n('There are local changes in the branch'),
More information about the Pkg-bazaar-commits
mailing list