← 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: Aaron Bentley
  • Date: 2008-03-03 16:52:41 UTC
  • mfrom: (3144.3.11 fix-conflict-handling)
  • mto: This revision was merged to the branch mainline in revision 3250.
  • Revision ID: aaron@aaronbentley.com-20080303165241-0k2c7ggs6kr9q6hf
Merge with fix-conflict-handling

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
385
385
        merger.merge_type = _mod_merge.Merge3Merger
386
386
        tree_merger = merger.make_merger()
387
387
        tt = tree_merger.make_preview_transform()
 
388
        self.addCleanup(tt.finalize)
388
389
        preview_tree = tt.get_preview_tree()
389
390
        tree_file = this_tree.get_file('file-id')
390
391
        try:
590
591
        self.add_version('REV2', ['ROOT'], 'abce')
591
592
        # both sides merge, discarding others' changes
592
593
        self.add_version('LCA1', ['REV1', 'REV2'], 'abcd')
593
 
        self.add_version('LCA2', ['REV1', 'REV2'], 'abce')
 
594
        self.add_version('LCA2', ['REV1', 'REV2'], 'fabce')
594
595
        plan = self.plan_merge_vf.plan_lca_merge('LCA1', 'LCA2')
595
 
        self.assertEqual([('unchanged', 'a\n'),
 
596
        self.assertEqual([('new-b', 'f\n'),
 
597
                          ('unchanged', 'a\n'),
596
598
                          ('unchanged', 'b\n'),
597
599
                          ('unchanged', 'c\n'),
598
600
                          ('conflicted-a', 'd\n'),