/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Aaron Bentley
  • Date: 2007-12-04 03:54:55 UTC
  • mto: This revision was merged to the branch mainline in revision 3133.
  • Revision ID: aaron.bentley@utoronto.ca-20071204035455-9baojlvaynm0wv5f
Sync up with bzr.dev API changes

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