← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-12-20 04:20:19 UTC
  • mfrom: (3062.2.13 fast-plan-merge2)
  • Revision ID: pqm@pqm.ubuntu.com-20071220042019-wsij5vgvhgw4qhdt
Annotate merge can do cherrypicks (abentley)

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):
 
520
    def plan_merge(self, ver_a, ver_b, base=None):
521
521
        """See VersionedFile.plan_merge"""
522
522
        from merge import _PlanMerge
523
 
        return _PlanMerge(ver_a, ver_b, self).plan_merge()
 
523
        if base is None:
 
524
            return _PlanMerge(ver_a, ver_b, self).plan_merge()
 
525
        old_plan = list(_PlanMerge(ver_a, base, self).plan_merge())
 
526
        new_plan = list(_PlanMerge(ver_a, ver_b, self).plan_merge())
 
527
        return _PlanMerge._subtract_plans(old_plan, new_plan)
 
528
 
524
529
 
525
530
    def add_lines(self, version_id, parents, lines):
526
531
        """See VersionedFile.add_lines