/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 merge.py

  • Committer: Jasper Groenewegen
  • Date: 2008-07-25 18:45:04 UTC
  • mfrom: (571.1.1 add-gmerge)
  • Revision ID: colbrac@xs4all.nl-20080725184504-qdztpy93ftgg9jy1
Merge addition of gmerge command line option

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge.py
46
46
        self.wt = wt
47
47
        self.wtpath = wtpath
48
48
        
49
 
        directory = os.path.dirname(self.wt.abspath(self.wtpath))
 
49
        if default_branch_path and os.path.isdir(default_branch_path.partition('file://')[2]):
 
50
            directory = default_branch_path.partition('file://')[2]
 
51
        else:
 
52
            directory = os.path.dirname(self.wt.abspath(self.wtpath))
50
53
        
51
54
        # Create widgets
52
55
        self._hbox = gtk.HBox()