/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: Mateusz Korniak
  • Date: 2007-09-11 10:17:33 UTC
  • mto: This revision was merged to the branch mainline in revision 275.
  • Revision ID: matkor@laptop-hp-20070911101733-k4ua1t0itz725o96
Add default_branch_path to MergeDialog and use it from olive-gtk

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
527
527
            error_dialog(_('There are local changes in the branch'),
528
528
                         _('Please commit or revert the changes before merging.'))
529
529
        else:
530
 
            merge = MergeDialog(self.wt, self.wtpath)
 
530
            parent_branch_path = self.wt.branch.get_parent()
 
531
            merge = MergeDialog(self.wt, self.wtpath,default_branch_path=parent_branch_path )
531
532
            merge.display()
532
533
 
533
534
    @show_bzr_error