← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robert Collins
  • Date: 2006-03-07 12:17:32 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060307121732-1a219b872ef18ecc
cleanup deprecation warnings and finish conversion so the inventory is knit based too.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
749
749
        this_revision_id = self.this_revision_tree.inventory[file_id].revision
750
750
        other_revision_id = \
751
751
            self.other_revision_tree.inventory[file_id].revision
752
 
        this_i = weave.lookup(this_revision_id)
753
 
        other_i = weave.lookup(other_revision_id)
754
 
        plan =  weave.plan_merge(this_i, other_i)
 
752
        plan =  weave.plan_merge(this_revision_id, other_revision_id)
755
753
        return weave.weave_merge(plan, '<<<<<<< TREE\n', 
756
754
                                       '>>>>>>> MERGE-SOURCE\n')
757
755