← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: John Arbash Meinel
  • Date: 2008-07-09 23:21:13 UTC
  • mto: This revision was merged to the branch mainline in revision 3543.
  • Revision ID: john@arbash-meinel.com-20080709232113-qvkxigm18om27i39
Switch to the get_parent_map design I had settled on.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
522
522
        self.add_version(('root', 'B'), [], 'xyz')
523
523
        my_plan = _PlanMerge('A', 'B', self.plan_merge_vf, ('root',))
524
524
        self.assertEqual([
525
 
                          ('new-a', 'a\n'),
526
 
                          ('new-a', 'b\n'),
527
 
                          ('new-a', 'c\n'),
528
525
                          ('new-b', 'x\n'),
529
526
                          ('new-b', 'y\n'),
530
 
                          ('new-b', 'z\n')],
 
527
                          ('new-b', 'z\n'),
 
528
                          ('new-a', 'a\n'),
 
529
                          ('new-a', 'b\n'),
 
530
                          ('new-a', 'c\n')],
531
531
                          list(my_plan.plan_merge()))
532
532
 
533
533
    def test_plan_merge(self):
538
538
                          ('unchanged', 'a\n'),
539
539
                          ('killed-a', 'b\n'),
540
540
                          ('killed-b', 'c\n'),
 
541
                          ('new-b', 'g\n'),
541
542
                          ('new-a', 'e\n'),
542
543
                          ('new-a', 'h\n'),
543
 
                          ('new-a', 'g\n'),
544
 
                          ('new-b', 'g\n')],
 
544
                          ('new-a', 'g\n')],
545
545
                         list(plan))
546
546
 
547
547
    def test_plan_merge_uncommitted_files(self):
552
552
                          ('unchanged', 'a\n'),
553
553
                          ('killed-a', 'b\n'),
554
554
                          ('killed-b', 'c\n'),
 
555
                          ('new-b', 'g\n'),
555
556
                          ('new-a', 'e\n'),
556
557
                          ('new-a', 'h\n'),
557
 
                          ('new-a', 'g\n'),
558
 
                          ('new-b', 'g\n')],
 
558
                          ('new-a', 'g\n')],
559
559
                         list(plan))
560
560
 
561
561
    def test_subtract_plans(self):