/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-07-27 22:47:49 UTC
  • mfrom: (7377 work)
  • mto: This revision was merged to the branch mainline in revision 7378.
  • Revision ID: jelmer@jelmer.uk-20190727224749-rta5fv1sc4ivy6ko
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/merge.py
1551
1551
                if other_parent is None or other_name is None:
1552
1552
                    other_path = '<deleted>'
1553
1553
                else:
1554
 
                    if other_parent == self.other_tree.get_root_id():
 
1554
                    if other_parent == self.other_tree.path2id(''):
1555
1555
                        # The tree transform doesn't know about the other root,
1556
1556
                        # so we special case here to avoid a NoFinalPath
1557
1557
                        # exception