/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 bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2008-08-01 05:10:27 UTC
  • mto: (3363.19.2 fix-iter-changes)
  • mto: This revision was merged to the branch mainline in revision 3752.
  • Revision ID: aaron@aaronbentley.com-20080801051027-pxdrrmxv18aa280u
Update merge to not use inventory

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
832
832
                    self.tt.delete_contents(trans_id)
833
833
                if file_id in self.other_tree:
834
834
                    # OTHER changed the file
835
 
                    create_by_entry(self.tt, 
836
 
                                    self.other_tree.inventory[file_id], 
 
835
                    create_by_entry(self.tt,
 
836
                                    self.other_tree.inventory[file_id],
837
837
                                    self.other_tree, trans_id)
838
 
                    if file_id not in self.this_tree.inventory:
 
838
                    if file_id not in self.this_tree:
839
839
                        self.tt.version_file(file_id, trans_id)
840
840
                    return "modified"
841
841
                elif file_id in self.this_tree.inventory: