/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/tests/test_merge.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/tests/test_merge.py
397
397
        ('killed-b', 'i\n'),
398
398
        ]
399
399
        self.assertEqual(subtracted_plan,
400
 
            list(PlanMerge._subtract_plans(old_plan, new_plan)))
 
400
            list(_PlanMerge._subtract_plans(old_plan, new_plan)))
401
401
 
402
402
    def test_plan_merge_with_base(self):
403
403
        self.add_version('COMMON', [], 'abc')
404
404
        self.add_version('THIS', ['COMMON'], 'abcd')
405
405
        self.add_version('BASE', ['COMMON'], 'eabc')
406
406
        self.add_version('OTHER', ['BASE'], 'eafb')
407
 
        plan = PlanMerge.plan_merge_with_base('THIS', 'BASE', 'OTHER',
408
 
                                              self.plan_merge_vf)
 
407
        plan = self.plan_merge_vf.plan_merge('THIS', 'OTHER', 'BASE')
409
408
        self.assertEqual([('unchanged', 'a\n'),
410
409
                          ('new-b', 'f\n'),
411
410
                          ('unchanged', 'b\n'),