/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge.py

  • Committer: Vincent Ladeuil
  • Date: 2008-01-03 15:12:58 UTC
  • mfrom: (3158 +trunk)
  • mto: (3159.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 3161.
  • Revision ID: v.ladeuil+lp@free.fr-20080103151258-idpzfox078f80vhe
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
70
70
        a_tree.revert(backups=False)
71
71
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type weave')
72
72
        a_tree.revert(backups=False)
 
73
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type lca')
 
74
        a_tree.revert(backups=False)
73
75
        self.run_bzr_error(['Show-base is not supported for this merge type'],
74
76
                           'merge ../b -r last:1..last:1 --merge-type weave'
75
77
                           ' --show-base')
420
422
        other_tree.commit('rev3b')
421
423
        self.run_bzr('merge --weave -d this other -r -2..-1')
422
424
        self.assertFileEqual('c\na\n', 'this/file')
 
425
 
 
426
    def test_lca_merge_criss_cross(self):
 
427
        tree_a = self.make_branch_and_tree('a')
 
428
        self.build_tree_contents([('a/file', 'base-contents\n')])
 
429
        tree_a.add('file')
 
430
        tree_a.commit('', rev_id='rev1')
 
431
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
 
432
        self.build_tree_contents([('a/file',
 
433
                                   'base-contents\nthis-contents\n')])
 
434
        tree_a.commit('', rev_id='rev2a')
 
435
        self.build_tree_contents([('b/file',
 
436
                                   'base-contents\nother-contents\n')])
 
437
        tree_b.commit('', rev_id='rev2b')
 
438
        tree_a.merge_from_branch(tree_b.branch)
 
439
        self.build_tree_contents([('a/file',
 
440
                                   'base-contents\nthis-contents\n')])
 
441
        tree_a.set_conflicts(ConflictList())
 
442
        tree_b.merge_from_branch(tree_a.branch)
 
443
        self.build_tree_contents([('b/file',
 
444
                                   'base-contents\nother-contents\n')])
 
445
        tree_b.set_conflicts(ConflictList())
 
446
        tree_a.commit('', rev_id='rev3a')
 
447
        tree_b.commit('', rev_id='rev3b')
 
448
        out, err = self.run_bzr(['merge', '-d', 'a', 'b', '--lca'], retcode=1)
 
449
        self.assertFileEqual('base-contents\n<<<<<<< TREE\nthis-contents\n'
 
450
                             '=======\nother-contents\n>>>>>>> MERGE-SOURCE\n',
 
451
                             'a/file')