/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/merge.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-29 13:16:26 UTC
  • mto: This revision was merged to the branch mainline in revision 7376.
  • Revision ID: jelmer@jelmer.uk-20190629131626-qioafloyemhdbm4w
Remove Tree.get_root_id() in favour of Tree.path2id('').

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/merge.py
1563
1563
                if other_parent is None or other_name is None:
1564
1564
                    other_path = '<deleted>'
1565
1565
                else:
1566
 
                    if other_parent == self.other_tree.get_root_id():
 
1566
                    if other_parent == self.other_tree.path2id(''):
1567
1567
                        # The tree transform doesn't know about the other root,
1568
1568
                        # so we special case here to avoid a NoFinalPath
1569
1569
                        # exception