← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

Update to bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
648
648
                          ('conflicted-b', 'e\n'),
649
649
                         ], list(plan))
650
650
 
 
651
    def test_plan_lca_merge_with_null(self):
 
652
        self.add_version(('root', 'A'), [], 'ab')
 
653
        self.add_version(('root', 'B'), [], 'bc')
 
654
        plan = self.plan_merge_vf.plan_lca_merge('A', 'B')
 
655
        self.assertEqual([('new-a', 'a\n'),
 
656
                          ('unchanged', 'b\n'),
 
657
                          ('new-b', 'c\n'),
 
658
                         ], list(plan))
 
659
 
651
660
 
652
661
class TestMergeImplementation(object):
653
662