← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-03-08 00:37:41 UTC
  • mfrom: (1594.2.4 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060308003741-08afccbf89005e87
Merge in :
 * Knit repositories use knits
 * Nested progress bar support.
 * Ghost aware graph api.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
762
762
        this_revision_id = self.this_revision_tree.inventory[file_id].revision
763
763
        other_revision_id = \
764
764
            self.other_revision_tree.inventory[file_id].revision
765
 
        this_i = weave.lookup(this_revision_id)
766
 
        other_i = weave.lookup(other_revision_id)
767
 
        plan =  weave.plan_merge(this_i, other_i)
 
765
        plan =  weave.plan_merge(this_revision_id, other_revision_id)
768
766
        return weave.weave_merge(plan, '<<<<<<< TREE\n', 
769
767
                                       '>>>>>>> MERGE-SOURCE\n')
770
768