[Pkg-bazaar-commits] ./bzr-gtk/unstable r554: Merge fixes for new MergeDialog

[Jasper Groenewegen]

------------------------------------------------------------
revno: 554
committer: Jasper Groenewegen <colbrac at xs4all.nl>
branch nick: trunk
timestamp: Fri 2008-07-18 20:25:39 +0200
message:
  Merge fixes for new MergeDialog
modified:
  merge.py
  olive/__init__.py
    ------------------------------------------------------------
    revno: 533.2.4
    committer: Jasper Groenewegen <colbrac at xs4all.nl>
    branch nick: mergedialog
    timestamp: Fri 2008-07-18 20:21:26 +0200
    message:
      Fix what is broken
    modified:
      merge.py
      olive/__init__.py
-------------- next part --------------
=== modified file 'merge.py'
--- a/merge.py	2008-07-17 23:15:43 +0000
+++ b/merge.py	2008-07-18 18:21:26 +0000
@@ -71,7 +71,7 @@
         # Add widgets to dialog
         self.vbox.add(self._hbox)
         self._hbox.add(self._label_merge_from)
-        self._hbox.add(self.filechooser)
+        self._hbox.add(self._filechooser)
         self._hbox.set_spacing(5)
         self.action_area.pack_end(self._button_merge)
         

=== modified file 'olive/__init__.py'
--- a/olive/__init__.py	2008-07-18 12:35:47 +0000
+++ b/olive/__init__.py	2008-07-18 18:25:39 +0000
@@ -553,6 +553,7 @@
             error_dialog(_i18n('There are local changes in the branch'),
                          _i18n('Please commit or revert the changes before merging.'))
         else:
+            parent_branch_path = self.wt.branch.get_parent()
             merge = MergeDialog(self.wt, self.wtpath, parent_branch_path, self.window)
             response = merge.run()
             merge.destroy()