← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-07-07 12:07:41 UTC
  • mfrom: (6012.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20110707120741-pfagsqufrv57xoe1
(vila) Handle path conflicts involving different root-ids (merged in
 from 2.3 + tweaks) (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1635
1635
                if other_parent is None or other_name is None:
1636
1636
                    other_path = '<deleted>'
1637
1637
                else:
1638
 
                    parent_path =  fp.get_path(
1639
 
                        self.tt.trans_id_file_id(other_parent))
 
1638
                    if other_parent == self.other_tree.get_root_id():
 
1639
                        # The tree transform doesn't know about the other root,
 
1640
                        # so we special case here to avoid a NoFinalPath
 
1641
                        # exception
 
1642
                        parent_path = ''
 
1643
                    else:
 
1644
                        parent_path =  fp.get_path(
 
1645
                            self.tt.trans_id_file_id(other_parent))
1640
1646
                    other_path = osutils.pathjoin(parent_path, other_name)
1641
1647
                c = _mod_conflicts.Conflict.factory(
1642
1648
                    'path conflict', path=this_path,