/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to olive/__init__.py

  • Committer: Jasper Groenewegen
  • Date: 2008-07-18 18:25:39 UTC
  • mfrom: (533.2.4 mergedialog)
  • Revision ID: colbrac@xs4all.nl-20080718182539-h65s9vgvq2zrxhbs
Merge fixes for new MergeDialog

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
553
553
            error_dialog(_i18n('There are local changes in the branch'),
554
554
                         _i18n('Please commit or revert the changes before merging.'))
555
555
        else:
 
556
            parent_branch_path = self.wt.branch.get_parent()
556
557
            merge = MergeDialog(self.wt, self.wtpath, parent_branch_path, self.window)
557
558
            response = merge.run()
558
559
            merge.destroy()