← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Vincent Ladeuil
  • Date: 2011-07-05 09:12:52 UTC
  • mto: (5050.77.1 2.2) (6012.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6013.
  • Revision ID: v.ladeuil+lp@free.fr-20110705091252-7qpkbzgr4wyrvwvq
https://launchpad.net/bugs/805809
Handle path conflicts involving different root-ids

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1624
1624
                if other_parent is None or other_name is None:
1625
1625
                    other_path = '<deleted>'
1626
1626
                else:
1627
 
                    parent_path =  fp.get_path(
1628
 
                        self.tt.trans_id_file_id(other_parent))
 
1627
                    if other_parent == self.other_tree.get_root_id():
 
1628
                        # The tree transform don't know about the other root,
 
1629
                        # so we special case here to avoid a NoFinalPath
 
1630
                        # exception
 
1631
                        parent_path = ''
 
1632
                    else:
 
1633
                        parent_path =  fp.get_path(
 
1634
                            self.tt.trans_id_file_id(other_parent))
1629
1635
                    other_path = osutils.pathjoin(parent_path, other_name)
1630
1636
                c = _mod_conflicts.Conflict.factory(
1631
1637
                    'path conflict', path=this_path,