/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-10-13 17:31:55 UTC
  • mfrom: (7397.4.9 remove-unused)
  • Revision ID: breezy.the.bot@gmail.com-20191013173155-yoiokny4mknxb3um
Remove Tree.has_id.

Merged from https://code.launchpad.net/~jelmer/brz/remove-unused/+merge/373320

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/merge.py
1855
1855
        name_in_target = osutils.basename(self._target_subdir)
1856
1856
        merge_into_root = subdir.copy()
1857
1857
        merge_into_root.name = name_in_target
1858
 
        if self.this_tree.has_id(merge_into_root.file_id):
 
1858
        try:
 
1859
            self.this_tree.id2path(merge_into_root.file_id)
 
1860
        except errors.NoSuchId:
 
1861
            pass
 
1862
        else:
1859
1863
            # Give the root a new file-id.
1860
1864
            # This can happen fairly easily if the directory we are
1861
1865
            # incorporating is the root, and both trees have 'TREE_ROOT' as