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'
136
138
self.failUnlessExists('sub/a.txt.BASE')
138
140
def test_merge_remember(self):
139
"""Merge changes from one branch to another and test parent location."""
141
"""Merge changes from one branch to another, test submit location."""
140
142
tree_a = self.make_branch_and_tree('branch_a')
141
143
branch_a = tree_a.branch
142
144
self.build_tree(['branch_a/a'])
167
169
self.run_bzr_error(['Working tree ".*" has uncommitted changes'],
168
170
'merge ../branch_a')
169
self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))
171
self.assertEquals(abspath(branch_b.get_submit_branch()),
170
173
# test implicit --remember after resolving conflict
171
174
tree_b.commit('commit d')
172
175
out, err = self.run_bzr('merge')
174
177
base = urlutils.local_path_from_url(branch_a.base)
175
self.assertEquals(out, 'Merging from remembered location %s\n' % (base,))
178
self.assertEquals(out,
179
'Merging from remembered location %s\n' % (base,))
176
180
self.assertEquals(err, '+N b\nAll changes applied successfully.\n')
177
self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))
181
self.assertEquals(abspath(branch_b.get_submit_branch()),
178
183
# re-open tree as external run_bzr modified it
179
184
tree_b = branch_b.bzrdir.open_workingtree()
180
185
tree_b.commit('merge branch_a')
182
187
out, err = self.run_bzr('merge ../branch_c --remember')
183
188
self.assertEquals(out, '')
184
189
self.assertEquals(err, '+N c\nAll changes applied successfully.\n')
185
self.assertEquals(abspath(branch_b.get_parent()),
190
self.assertEquals(abspath(branch_b.get_submit_branch()),
186
191
abspath(branch_c.bzrdir.root_transport.base))
187
192
# re-open tree as external run_bzr modified it
188
193
tree_b = branch_b.bzrdir.open_workingtree()
408
413
out, err = self.run_bzr(['merge', '-d', 'a', 'b'])
409
414
self.assertContainsRe(err, 'Warning: criss-cross merge encountered.')
416
def test_merge_from_submit(self):
417
tree_a = self.make_branch_and_tree('a')
418
tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
419
tree_c = tree_a.bzrdir.sprout('c').open_workingtree()
420
out, err = self.run_bzr(['merge', '-d', 'c'])
421
self.assertContainsRe(out, 'Merging from remembered location .*a\/$')
422
tree_c.branch.set_submit_branch(tree_b.bzrdir.root_transport.base)
423
out, err = self.run_bzr(['merge', '-d', 'c'])
424
self.assertContainsRe(out, 'Merging from remembered location .*b\/$')
426
def test_remember_sets_submit(self):
427
tree_a = self.make_branch_and_tree('a')
428
tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
429
self.assertIs(tree_b.branch.get_submit_branch(), None)
431
# Remember should not happen if using default from parent
432
out, err = self.run_bzr(['merge', '-d', 'b'])
433
self.assertIs(tree_b.branch.get_submit_branch(), None)
435
# Remember should happen if user supplies location
436
out, err = self.run_bzr(['merge', '-d', 'b', 'a'])
437
self.assertEqual(tree_b.branch.get_submit_branch(),
438
tree_a.bzrdir.root_transport.base)
411
440
def test_weave_cherrypick(self):
412
441
this_tree = self.make_branch_and_tree('this')
413
442
self.build_tree_contents([('this/file', "a\n")])
420
449
other_tree.commit('rev3b')
421
450
self.run_bzr('merge --weave -d this other -r -2..-1')
422
451
self.assertFileEqual('c\na\n', 'this/file')
453
def test_lca_merge_criss_cross(self):
454
tree_a = self.make_branch_and_tree('a')
455
self.build_tree_contents([('a/file', 'base-contents\n')])
457
tree_a.commit('', rev_id='rev1')
458
tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
459
self.build_tree_contents([('a/file',
460
'base-contents\nthis-contents\n')])
461
tree_a.commit('', rev_id='rev2a')
462
self.build_tree_contents([('b/file',
463
'base-contents\nother-contents\n')])
464
tree_b.commit('', rev_id='rev2b')
465
tree_a.merge_from_branch(tree_b.branch)
466
self.build_tree_contents([('a/file',
467
'base-contents\nthis-contents\n')])
468
tree_a.set_conflicts(ConflictList())
469
tree_b.merge_from_branch(tree_a.branch)
470
self.build_tree_contents([('b/file',
471
'base-contents\nother-contents\n')])
472
tree_b.set_conflicts(ConflictList())
473
tree_a.commit('', rev_id='rev3a')
474
tree_b.commit('', rev_id='rev3b')
475
out, err = self.run_bzr(['merge', '-d', 'a', 'b', '--lca'], retcode=1)
476
self.assertFileEqual('base-contents\n<<<<<<< TREE\nthis-contents\n'
477
'=======\nother-contents\n>>>>>>> MERGE-SOURCE\n',
480
def test_merge_preview(self):
481
this_tree = self.make_branch_and_tree('this')
482
this_tree.commit('rev1')
483
other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
484
self.build_tree_contents([('other/file', 'new line')])
485
other_tree.add('file')
486
other_tree.commit('rev2a')
487
this_tree.commit('rev2b')
488
out, err = self.run_bzr(['merge', '-d', 'this', 'other', '--preview'])
489
self.assertContainsRe(out, '\+new line')
490
self.assertNotContainsRe(err, '\+N file\n')
491
this_tree.lock_read()
492
self.addCleanup(this_tree.unlock)
494
list(this_tree._iter_changes(this_tree.basis_tree())))
added
removed
bzrlib/tests/blackbox/test_merge.py
