← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Aaron Bentley
  • Date: 2007-12-03 21:33:36 UTC
  • mto: This revision was merged to the branch mainline in revision 3073.
  • Revision ID: abentley@panoramicfeedback.com-20071203213336-tpv1ftv3kxpp8x08
Make _PlanMerge an implementation detail of _PlanMergeVersionedFile

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
303
303
        vf = versionedfile._PlanMergeVersionedFile(file_id)
304
304
        last_revision_a = self._get_file_revision(file_id, vf, 'this:')
305
305
        last_revision_b = other._get_file_revision(file_id, vf, 'other:')
306
 
        plan = merge.PlanMerge(last_revision_a, last_revision_b, vf)
307
 
        return plan.plan_merge()
 
306
        return vf.plan_merge(last_revision_a, last_revision_b)
308
307
 
309
308
    def _get_file_revision(self, file_id, vf, tree_revision):
310
309
        def file_revision(revision_tree):