← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.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/versionedfile.py
517
517
        self._parents = {}
518
518
        self._lines = {}
519
519
 
 
520
    def plan_merge(self, ver_a, ver_b):
 
521
        """See VersionedFile.plan_merge"""
 
522
        from merge import _PlanMerge
 
523
        return _PlanMerge(ver_a, ver_b, self).plan_merge()
 
524
 
520
525
    def add_lines(self, version_id, parents, lines):
521
526
        """See VersionedFile.add_lines
522
527