← 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: Canonical.com Patch Queue Manager
  • Date: 2008-05-29 20:34:27 UTC
  • mfrom: (3287.17.2 lca_with_null_235715)
  • Revision ID: pqm@pqm.ubuntu.com-20080529203427-tp2iw6h86fd1sauh
(jam) Fix bug #235715,
        use an empty list for an LCA base if we encounter NULL_REVISION

Show diffs side-by-side

added added

removed removed

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