← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Patch Queue Manager
  • Date: 2012-02-23 19:39:07 UTC
  • mfrom: (6468.3.3 bzr)
  • Revision ID: pqm@pqm.ubuntu.com-20120223193907-11erj8xxjmrchawp
(jelmer) Use Tree.iter_children() in a couple more places. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1102
1102
            # other_root doesn't have a physical representation. We still need
1103
1103
            # to move any references to the actual root of the tree.
1104
1104
            other_root_is_present = False
1105
 
        # 'other_tree.inventory.root' is not present in this tree. We are
 
1105
        # the other tree root is not present in this tree. We are
1106
1106
        # calling adjust_path for children which *want* to be present with a
1107
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(
 
1109
                self.other_tree.get_root_id()):
 
1110
            trans_id = self.tt.trans_id_file_id(child_id)
1110
1111
            if not other_root_is_present:
1111
1112
                if self.tt.final_kind(trans_id) is not None:
1112
1113
                    # The item exist in the final tree and has a defined place