~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/merge.py

Merge lp:~jelmer/bzr/use-tree-iter-children

added added

removed removed

1105

# 'other_tree.inventory.root' is not present in this tree. We are

1106

# calling adjust_path for children which *want* to be present with a

1107

# correct place to go.

1108

for _, child in self.other_tree.inventory.root.children.iteritems():

1109

trans_id = self.tt.trans_id_file_id(child.file_id)

1108

for child_id in self.other_tree.iter_children(self.other_tree.get_root_id()):

1109

trans_id = self.tt.trans_id_file_id(child_id)

1110

if not other_root_is_present:

1111

if self.tt.final_kind(trans_id) is not None:

1112

# The item exist in the final tree and has a defined place