← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-13 14:33:56 UTC
  • mto: This revision was merged to the branch mainline in revision 5786.
  • Revision ID: john@arbash-meinel.com-20110413143356-b7meeh27345dxhe7
Remove the 'include_unchanged=True' from iter_changes.
Add more edge case testing. 
This causes an existing test to start failing, which would fail
in the real world.
Basically, if you delete an item that was in an old root,
we try to update it to be located in the new root, but
it is deleted anyway. So *doing* the update is bogus.
(It would give it a name, but since it didn't have contents,
it wouldn't actually do anything.)
Still needs to be fixed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
911
911
        """
912
912
        result = []
913
913
        iterator = self.other_tree.iter_changes(self.base_tree,
914
 
                include_unchanged=True, specific_files=self.interesting_files,
 
914
                specific_files=self.interesting_files,
915
915
                extra_trees=[self.this_tree])
916
916
        this_entries = dict((e.file_id, e) for p, e in
917
917
                            self.this_tree.iter_entries_by_dir(
1126
1126
        # 'other_tree.inventory.root' is not present in this tree. We are
1127
1127
        # calling adjust_path for children which *want* to be present with a
1128
1128
        # correct place to go.
1129
 
        for thing, child in self.other_tree.inventory.root.children.iteritems():
 
1129
        for _, child in self.other_tree.inventory.root.children.iteritems():
1130
1130
            trans_id = self.tt.trans_id_file_id(child.file_id)
1131
1131
            if not other_root_is_present:
1132
1132
                if self.tt.final_kind(trans_id) is not None: