← 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-03-03 18:14:09 UTC
  • mfrom: (3144.3.11 fix-conflict-handling)
  • Revision ID: pqm@pqm.ubuntu.com-20080303181409-gyupt23ikib7s46z
Use correct index in LCA merge (abentley, #196780)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
591
591
        self.add_version('REV2', ['ROOT'], 'abce')
592
592
        # both sides merge, discarding others' changes
593
593
        self.add_version('LCA1', ['REV1', 'REV2'], 'abcd')
594
 
        self.add_version('LCA2', ['REV1', 'REV2'], 'abce')
 
594
        self.add_version('LCA2', ['REV1', 'REV2'], 'fabce')
595
595
        plan = self.plan_merge_vf.plan_lca_merge('LCA1', 'LCA2')
596
 
        self.assertEqual([('unchanged', 'a\n'),
 
596
        self.assertEqual([('new-b', 'f\n'),
 
597
                          ('unchanged', 'a\n'),
597
598
                          ('unchanged', 'b\n'),
598
599
                          ('unchanged', 'c\n'),
599
600
                          ('conflicted-a', 'd\n'),