/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:21:26 UTC
  • mto: This revision was merged to the branch mainline in revision 554.
  • Revision ID: colbrac@xs4all.nl-20080718182126-cl0z0puknfgn0tuz
Fix what is broken

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
543
543
            error_dialog(_i18n('There are local changes in the branch'),
544
544
                         _i18n('Please commit or revert the changes before merging.'))
545
545
        else:
 
546
            parent_branch_path = self.wt.branch.get_parent()
546
547
            merge = MergeDialog(self.wt, self.wtpath, parent_branch_path, self.window)
547
548
            response = merge.run()
548
549
            merge.destroy()