← 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-05-29 18:57:31 UTC
  • mto: This revision was merged to the branch mainline in revision 3459.
  • Revision ID: john@arbash-meinel.com-20080529185731-7ibxuku11bwkrb30
https://launchpad.net/bugs/235715
Fix bug #235715 by using the empty list as the text for a base of NULL_REVISION.

Add a test for this case as well.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
630
630
                          ('conflicted-b', 'e\n'),
631
631
                         ], list(plan))
632
632
 
 
633
    def test_plan_lca_merge_with_null(self):
 
634
        self.add_version('A', [], 'ab')
 
635
        self.add_version('B', [], 'bc')
 
636
        plan = self.plan_merge_vf.plan_lca_merge('A', 'B')
 
637
        self.assertEqual([('new-a', 'a\n'),
 
638
                          ('unchanged', 'b\n'),
 
639
                          ('new-b', 'c\n'),
 
640
                         ], list(plan))
 
641
 
633
642
 
634
643
class TestMergeImplementation(object):
635
644