← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

(vila) Provide a config section matcher respecting the file order. (Vincent
 Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1091
1091
        other_root = self.tt.trans_id_file_id(other_root_file_id)
1092
1092
        if other_root == self.tt.root:
1093
1093
            return
1094
 
        if self.this_tree.has_id(
1095
 
            self.other_tree.get_root_id()):
 
1094
        if self.this_tree.inventory.has_id(
 
1095
            self.other_tree.inventory.root.file_id):
1096
1096
            # the other tree's root is a non-root in the current tree (as
1097
1097
            # when a previously unrelated branch is merged into another)
1098
1098
            return
1948
1948
            raise PathNotInTree(self._source_subpath, "Source tree")
1949
1949
        subdir = other_inv[subdir_id]
1950
1950
        parent_in_target = osutils.dirname(self._target_subdir)
1951
 
        target_id = self.this_tree.path2id(parent_in_target)
 
1951
        target_id = self.this_tree.inventory.path2id(parent_in_target)
1952
1952
        if target_id is None:
1953
1953
            raise PathNotInTree(self._target_subdir, "Target tree")
1954
1954
        name_in_target = osutils.basename(self._target_subdir)
1955
1955
        merge_into_root = subdir.copy()
1956
1956
        merge_into_root.name = name_in_target
1957
 
        if self.this_tree.has_id(merge_into_root.file_id):
 
1957
        if self.this_tree.inventory.has_id(merge_into_root.file_id):
1958
1958
            # Give the root a new file-id.
1959
1959
            # This can happen fairly easily if the directory we are
1960
1960
            # incorporating is the root, and both trees have 'TREE_ROOT' as