← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2009-06-04 16:50:33 UTC
  • mto: This revision was merged to the branch mainline in revision 4410.
  • Revision ID: john@arbash-meinel.com-20090604165033-bfdo0lyf4yt4vjcz
We don't need a base Coder class, because Decoder._update_tail is different than Encoder._update_tail.
(one adds, one subtracts from self.size).
So we now have 2 versions of the macro, and the test suite stops crashing... :)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
1
 
# Copyright (C) 2006-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2006, 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
19
19
"""Black-box tests for bzr merge.
20
20
"""
21
21
 
22
 
import doctest
23
22
import os
24
23
 
25
 
from testtools import matchers
26
 
 
27
 
from bzrlib import (
28
 
    branch,
29
 
    conflicts,
30
 
    controldir,
31
 
    merge_directive,
32
 
    osutils,
33
 
    tests,
34
 
    urlutils,
35
 
    workingtree,
36
 
    )
37
 
from bzrlib.tests import (
38
 
    scenarios,
39
 
    script,
40
 
    )
41
 
 
42
 
 
43
 
load_tests = scenarios.load_tests_apply_scenarios
44
 
 
45
 
 
46
 
class TestMerge(tests.TestCaseWithTransport):
 
24
from bzrlib import merge_directive
 
25
from bzrlib.branch import Branch
 
26
from bzrlib.bzrdir import BzrDir
 
27
from bzrlib.conflicts import ConflictList, ContentsConflict
 
28
from bzrlib.osutils import abspath, file_kind, pathjoin
 
29
from bzrlib.tests.blackbox import ExternalBase
 
30
import bzrlib.urlutils as urlutils
 
31
from bzrlib.workingtree import WorkingTree
 
32
 
 
33
 
 
34
class TestMerge(ExternalBase):
47
35
 
48
36
    def example_branch(self, path='.'):
49
37
        tree = self.make_branch_and_tree(path)
50
38
        self.build_tree_contents([
51
 
            (osutils.pathjoin(path, 'hello'), 'foo'),
52
 
            (osutils.pathjoin(path, 'goodbye'), 'baz')])
 
39
            (pathjoin(path, 'hello'), 'foo'),
 
40
            (pathjoin(path, 'goodbye'), 'baz')])
53
41
        tree.add('hello')
54
42
        tree.commit(message='setup')
55
43
        tree.add('goodbye')
75
63
        return tree, other
76
64
 
77
65
    def test_merge_reprocess(self):
78
 
        d = controldir.ControlDir.create_standalone_workingtree('.')
 
66
        d = BzrDir.create_standalone_workingtree('.')
79
67
        d.commit('h')
80
68
        self.run_bzr('merge . --reprocess --merge-type weave')
81
69
 
82
70
    def test_merge(self):
 
71
        from bzrlib.branch import Branch
 
72
 
83
73
        a_tree = self.example_branch('a')
84
74
        ancestor = a_tree.branch.revno()
85
75
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
88
78
 
89
79
        self.build_tree_contents([('a/hello', 'quuux')])
90
80
        # We can't merge when there are in-tree changes
91
 
        self.run_bzr('merge ../b', retcode=3, working_dir='a')
92
 
        a = workingtree.WorkingTree.open('a')
 
81
        os.chdir('a')
 
82
        self.run_bzr('merge ../b', retcode=3)
 
83
        a = WorkingTree.open('.')
93
84
        a_tip = a.commit("Like an epidemic of u's")
94
 
 
95
 
        def run_merge_then_revert(args, retcode=None, working_dir='a'):
96
 
            self.run_bzr(['merge', '../b', '-r', 'last:1..last:1'] + args,
97
 
                         retcode=retcode, working_dir=working_dir)
98
 
            if retcode != 3:
99
 
                a_tree.revert(backups=False)
100
 
 
101
 
        run_merge_then_revert(['--merge-type', 'bloof'], retcode=3)
102
 
        run_merge_then_revert(['--merge-type', 'merge3'])
103
 
        run_merge_then_revert(['--merge-type', 'weave'])
104
 
        run_merge_then_revert(['--merge-type', 'lca'])
 
85
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type blooof',
 
86
                    retcode=3)
 
87
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type merge3')
 
88
        a_tree.revert(backups=False)
 
89
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type weave')
 
90
        a_tree.revert(backups=False)
 
91
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type lca')
 
92
        a_tree.revert(backups=False)
105
93
        self.run_bzr_error(['Show-base is not supported for this merge type'],
106
94
                           'merge ../b -r last:1..last:1 --merge-type weave'
107
 
                           ' --show-base', working_dir='a')
108
 
        a_tree.revert(backups=False)
109
 
        self.run_bzr('merge ../b -r last:1..last:1 --reprocess',
110
 
                     working_dir='a')
111
 
        a_tree.revert(backups=False)
112
 
        self.run_bzr('merge ../b -r last:1', working_dir='a')
113
 
        self.check_file_contents('a/goodbye', 'quux')
 
95
                           ' --show-base')
 
96
        a_tree.revert(backups=False)
 
97
        self.run_bzr('merge ../b -r last:1..last:1 --reprocess')
 
98
        a_tree.revert(backups=False)
 
99
        self.run_bzr('merge ../b -r last:1')
 
100
        self.check_file_contents('goodbye', 'quux')
114
101
        # Merging a branch pulls its revision into the tree
115
 
        b = branch.Branch.open('b')
 
102
        b = Branch.open('../b')
116
103
        b_tip = b.last_revision()
117
 
        self.assertTrue(a.branch.repository.has_revision(b_tip))
 
104
        self.failUnless(a.branch.repository.has_revision(b_tip))
118
105
        self.assertEqual([a_tip, b_tip], a.get_parent_ids())
119
106
        a_tree.revert(backups=False)
120
 
        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3,
121
 
                                working_dir='a')
 
107
        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3)
122
108
        self.assertTrue("Not a branch" in err)
123
109
        self.run_bzr('merge -r revno:%d:./..revno:%d:../b'
124
 
                    %(ancestor,b.revno()), working_dir='a')
125
 
        self.assertEqual(a.get_parent_ids(),
 
110
                    %(ancestor,b.revno()))
 
111
        self.assertEquals(a.get_parent_ids(),
126
112
                          [a.branch.last_revision(), b.last_revision()])
127
 
        self.check_file_contents('a/goodbye', 'quux')
 
113
        self.check_file_contents('goodbye', 'quux')
128
114
        a_tree.revert(backups=False)
129
 
        self.run_bzr('merge -r revno:%d:../b'%b.revno(), working_dir='a')
130
 
        self.assertEqual(a.get_parent_ids(),
 
115
        self.run_bzr('merge -r revno:%d:../b'%b.revno())
 
116
        self.assertEquals(a.get_parent_ids(),
131
117
                          [a.branch.last_revision(), b.last_revision()])
132
118
        a_tip = a.commit('merged')
133
 
        self.run_bzr('merge ../b -r last:1', working_dir='a')
 
119
        self.run_bzr('merge ../b -r last:1')
134
120
        self.assertEqual([a_tip], a.get_parent_ids())
135
121
 
136
122
    def test_merge_defaults_to_reprocess(self):
215
201
            ('b/b.txt', 'hello\nsomething\n'),
216
202
            ('b/sub/c.txt', 'hello\nsomething\n')])
217
203
        b_tree.commit(message='Modified a.txt')
218
 
 
219
 
        self.run_bzr('merge ../a/', retcode=1, working_dir='b')
220
 
        self.assertPathExists('b/sub/a.txt.THIS')
221
 
        self.assertPathExists('b/sub/a.txt.BASE')
222
 
 
223
 
        self.run_bzr('merge ../b/', retcode=1, working_dir='a')
224
 
        self.assertPathExists('a/sub/a.txt.OTHER')
225
 
        self.assertPathExists('a/sub/a.txt.BASE')
226
 
 
227
 
    def test_conflict_leaves_base_this_other_files(self):
228
 
        tree, other = self.create_conflicting_branches()
229
 
        self.run_bzr('merge ../other', working_dir='tree',
230
 
                     retcode=1)
231
 
        self.assertFileEqual('a\nb\nc\n', 'tree/fname.BASE')
232
 
        self.assertFileEqual('a\nB\nD\n', 'tree/fname.OTHER')
233
 
        self.assertFileEqual('a\nB\nC\n', 'tree/fname.THIS')
234
 
 
235
 
    def test_weave_conflict_leaves_base_this_other_files(self):
236
 
        tree, other = self.create_conflicting_branches()
237
 
        self.run_bzr('merge ../other --weave', working_dir='tree',
238
 
                     retcode=1)
239
 
        self.assertFileEqual('a\nb\nc\n', 'tree/fname.BASE')
240
 
        self.assertFileEqual('a\nB\nD\n', 'tree/fname.OTHER')
241
 
        self.assertFileEqual('a\nB\nC\n', 'tree/fname.THIS')
 
204
        os.chdir('b')
 
205
        self.run_bzr('merge ../a/', retcode=1)
 
206
        self.failUnlessExists('sub/a.txt.THIS')
 
207
        self.failUnlessExists('sub/a.txt.BASE')
 
208
        os.chdir('../a')
 
209
        self.run_bzr('merge ../b/', retcode=1)
 
210
        self.failUnlessExists('sub/a.txt.OTHER')
 
211
        self.failUnlessExists('sub/a.txt.BASE')
242
212
 
243
213
    def test_merge_remember(self):
244
214
        """Merge changes from one branch to another, test submit location."""
262
232
        branch_b.set_parent(None)
263
233
        self.assertEqual(None, branch_b.get_parent())
264
234
        # test merge for failure without parent set
265
 
        out = self.run_bzr('merge', retcode=3, working_dir='branch_b')
266
 
        self.assertEqual(out,
 
235
        os.chdir('branch_b')
 
236
        out = self.run_bzr('merge', retcode=3)
 
237
        self.assertEquals(out,
267
238
                ('','bzr: ERROR: No location specified or remembered\n'))
268
239
 
269
240
        # test uncommitted changes
270
 
        self.build_tree(['branch_b/d'])
 
241
        self.build_tree(['d'])
271
242
        tree_b.add('d')
272
243
        self.run_bzr_error(['Working tree ".*" has uncommitted changes'],
273
 
                           'merge', working_dir='branch_b')
 
244
                           'merge')
274
245
 
275
246
        # merge should now pass and implicitly remember merge location
276
247
        tree_b.commit('commit d')
277
 
        out, err = self.run_bzr('merge ../branch_a', working_dir='branch_b')
 
248
        out, err = self.run_bzr('merge ../branch_a')
278
249
 
279
250
        base = urlutils.local_path_from_url(branch_a.base)
280
251
        self.assertEndsWith(err, '+N  b\nAll changes applied successfully.\n')
281
 
        # re-open branch as external run_bzr modified it
282
 
        branch_b = branch_b.bzrdir.open_branch()
283
 
        self.assertEqual(osutils.abspath(branch_b.get_submit_branch()),
284
 
                          osutils.abspath(parent))
 
252
        self.assertEquals(abspath(branch_b.get_submit_branch()),
 
253
                          abspath(parent))
285
254
        # test implicit --remember when committing new file
286
 
        self.build_tree(['branch_b/e'])
 
255
        self.build_tree(['e'])
287
256
        tree_b.add('e')
288
257
        tree_b.commit('commit e')
289
 
        out, err = self.run_bzr('merge', working_dir='branch_b')
290
 
        self.assertStartsWith(
291
 
            err, 'Merging from remembered submit location %s\n' % (base,))
 
258
        out, err = self.run_bzr('merge')
 
259
        self.assertStartsWith(err,
 
260
                          'Merging from remembered submit location %s\n' % (base,))
292
261
        # re-open tree as external run_bzr modified it
293
262
        tree_b = branch_b.bzrdir.open_workingtree()
294
263
        tree_b.commit('merge branch_a')
295
264
        # test explicit --remember
296
 
        out, err = self.run_bzr('merge ../branch_c --remember',
297
 
                                working_dir='branch_b')
298
 
        self.assertEqual(out, '')
299
 
        self.assertEqual(err, '+N  c\nAll changes applied successfully.\n')
300
 
        # re-open branch as external run_bzr modified it
301
 
        branch_b = branch_b.bzrdir.open_branch()
302
 
        self.assertEqual(osutils.abspath(branch_b.get_submit_branch()),
303
 
                          osutils.abspath(branch_c.bzrdir.root_transport.base))
 
265
        out, err = self.run_bzr('merge ../branch_c --remember')
 
266
        self.assertEquals(out, '')
 
267
        self.assertEquals(err, '+N  c\nAll changes applied successfully.\n')
 
268
        self.assertEquals(abspath(branch_b.get_submit_branch()),
 
269
                          abspath(branch_c.bzrdir.root_transport.base))
304
270
        # re-open tree as external run_bzr modified it
305
271
        tree_b = branch_b.bzrdir.open_workingtree()
306
272
        tree_b.commit('merge branch_c')
318
284
 
319
285
        self.build_tree_contents([('branch_b/a', 'goodbye')])
320
286
        tree_b.commit('message')
321
 
        self.run_bzr('bundle ../branch_a -o ../bundle', working_dir='branch_b')
322
 
        self.run_bzr('merge ../bundle', retcode=1, working_dir='branch_a')
 
287
        os.chdir('branch_b')
 
288
        self.run_bzr('bundle ../branch_a -o ../bundle')
 
289
        os.chdir('../branch_a')
 
290
        self.run_bzr('merge ../bundle', retcode=1)
323
291
        testament_a = Testament.from_revision(tree_a.branch.repository,
324
292
                                              tree_b.get_parent_ids()[0])
325
293
        testament_b = Testament.from_revision(tree_b.branch.repository,
326
294
                                              tree_b.get_parent_ids()[0])
327
295
        self.assertEqualDiff(testament_a.as_text(),
328
296
                         testament_b.as_text())
329
 
        tree_a.set_conflicts(conflicts.ConflictList())
 
297
        tree_a.set_conflicts(ConflictList())
330
298
        tree_a.commit('message')
331
299
        # it is legal to attempt to merge an already-merged bundle
332
 
        err = self.run_bzr('merge ../bundle', working_dir='branch_a')[1]
 
300
        output = self.run_bzr('merge ../bundle')[1]
333
301
        # but it does nothing
334
302
        self.assertFalse(tree_a.changes_from(tree_a.basis_tree()).has_changed())
335
 
        self.assertEqual('Nothing to do.\n', err)
 
303
        self.assertEqual('Nothing to do.\n', output)
336
304
 
337
305
    def test_merge_uncommitted(self):
338
306
        """Check that merge --uncommitted behaves properly"""
341
309
        tree_a.add(['file_1', 'file_2'])
342
310
        tree_a.commit('commit 1')
343
311
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
344
 
        self.assertPathExists('b/file_1')
 
312
        self.failUnlessExists('b/file_1')
345
313
        tree_a.rename_one('file_1', 'file_i')
346
314
        tree_a.commit('commit 2')
347
315
        tree_a.rename_one('file_2', 'file_ii')
 
316
        ## os.chdir('b')
348
317
        self.run_bzr('merge a --uncommitted -d b')
349
 
        self.assertPathExists('b/file_1')
350
 
        self.assertPathExists('b/file_ii')
 
318
        self.failUnlessExists('b/file_1')
 
319
        self.failUnlessExists('b/file_ii')
351
320
        tree_b.revert()
352
321
        self.run_bzr_error(('Cannot use --uncommitted and --revision',),
353
322
                           'merge /a --uncommitted -r1 -d b')
359
328
        tree_a.bzrdir.sprout('tree_b')
360
329
        self.build_tree(['tree_a/file1', 'tree_a/file2'])
361
330
        tree_a.add(['file1', 'file2'])
362
 
        self.run_bzr(['merge', '--uncommitted', '../tree_a/file1'],
363
 
                     working_dir='tree_b')
364
 
        self.assertPathExists('tree_b/file1')
365
 
        self.assertPathDoesNotExist('tree_b/file2')
366
 
 
367
 
    def test_merge_nonexistent_file(self):
368
 
        """It should not be possible to merge changes from a file which
369
 
        does not exist."""
370
 
        tree_a = self.make_branch_and_tree('tree_a')
371
 
        self.build_tree_contents([('tree_a/file', 'bar\n')])
372
 
        tree_a.add(['file'])
373
 
        tree_a.commit('commit 1')
374
 
        self.run_bzr_error(('Path\(s\) do not exist: non/existing',),
375
 
                           ['merge', 'non/existing'], working_dir='tree_a')
 
331
        os.chdir('tree_b')
 
332
        self.run_bzr(['merge', '--uncommitted', '../tree_a/file1'])
 
333
        self.failUnlessExists('file1')
 
334
        self.failIfExists('file2')
376
335
 
377
336
    def pullable_branch(self):
378
337
        tree_a = self.make_branch_and_tree('a')
379
 
        self.build_tree_contents([('a/file', 'bar\n')])
 
338
        self.build_tree(['a/file'])
380
339
        tree_a.add(['file'])
381
340
        self.id1 = tree_a.commit('commit 1')
382
341
 
383
342
        tree_b = self.make_branch_and_tree('b')
384
343
        tree_b.pull(tree_a.branch)
385
 
        self.build_tree_contents([('b/file', 'foo\n')])
 
344
        file('b/file', 'wb').write('foo')
386
345
        self.id2 = tree_b.commit('commit 2')
387
346
 
388
347
    def test_merge_pull(self):
389
348
        self.pullable_branch()
390
 
        (out, err) = self.run_bzr('merge --pull ../b', working_dir='a')
 
349
        os.chdir('a')
 
350
        (out, err) = self.run_bzr('merge --pull ../b')
391
351
        self.assertContainsRe(out, 'Now on revision 2\\.')
392
 
        tree_a = workingtree.WorkingTree.open('a')
 
352
        tree_a = WorkingTree.open('.')
393
353
        self.assertEqual([self.id2], tree_a.get_parent_ids())
394
354
 
395
 
    def test_merge_pull_preview(self):
396
 
        self.pullable_branch()
397
 
        (out, err) = self.run_bzr('merge --pull --preview -d a b')
398
 
        self.assertThat(out, matchers.DocTestMatches(
399
 
"""=== modified file 'file'
400
 
--- file\t...
401
 
+++ file\t...
402
 
@@ -1,1 +1,1 @@
403
 
-bar
404
 
+foo
405
 
 
406
 
""", doctest.ELLIPSIS | doctest.REPORT_UDIFF))
407
 
        tree_a = workingtree.WorkingTree.open('a')
408
 
        self.assertEqual([self.id1], tree_a.get_parent_ids())
409
 
 
410
355
    def test_merge_kind_change(self):
411
356
        tree_a = self.make_branch_and_tree('tree_a')
412
357
        self.build_tree_contents([('tree_a/file', 'content_1')])
416
361
        os.unlink('tree_a/file')
417
362
        self.build_tree(['tree_a/file/'])
418
363
        tree_a.commit('changed file to directory')
419
 
        self.run_bzr('merge ../tree_a', working_dir='tree_b')
420
 
        self.assertEqual('directory', osutils.file_kind('tree_b/file'))
 
364
        os.chdir('tree_b')
 
365
        self.run_bzr('merge ../tree_a')
 
366
        self.assertEqual('directory', file_kind('file'))
421
367
        tree_b.revert()
422
 
        self.assertEqual('file', osutils.file_kind('tree_b/file'))
423
 
        self.build_tree_contents([('tree_b/file', 'content_2')])
 
368
        self.assertEqual('file', file_kind('file'))
 
369
        self.build_tree_contents([('file', 'content_2')])
424
370
        tree_b.commit('content change')
425
 
        self.run_bzr('merge ../tree_a', retcode=1, working_dir='tree_b')
 
371
        self.run_bzr('merge ../tree_a', retcode=1)
426
372
        self.assertEqual(tree_b.conflicts(),
427
 
                         [conflicts.ContentsConflict('file',
428
 
                                                     file_id='file-id')])
 
373
                         [ContentsConflict('file', file_id='file-id')])
429
374
 
430
375
    def test_directive_cherrypick(self):
431
376
        source = self.make_branch_and_tree('source')
432
 
        source.commit("nothing")
433
 
        # see https://bugs.launchpad.net/bzr/+bug/409688 - trying to
434
 
        # cherrypick from one branch into another unrelated branch with a
435
 
        # different root id will give shape conflicts.  as a workaround we
436
 
        # make sure they share the same root id.
437
 
        target = source.bzrdir.sprout('target').open_workingtree()
438
377
        self.build_tree(['source/a'])
439
378
        source.add('a')
440
379
        source.commit('Added a', rev_id='rev1')
441
380
        self.build_tree(['source/b'])
442
381
        source.add('b')
443
382
        source.commit('Added b', rev_id='rev2')
 
383
        target = self.make_branch_and_tree('target')
444
384
        target.commit('empty commit')
445
385
        self.write_directive('directive', source.branch, 'target', 'rev2',
446
386
                             'rev1')
447
387
        out, err = self.run_bzr('merge -d target directive')
448
 
        self.assertPathDoesNotExist('target/a')
449
 
        self.assertPathExists('target/b')
 
388
        self.failIfExists('target/a')
 
389
        self.failUnlessExists('target/b')
450
390
        self.assertContainsRe(err, 'Performing cherrypick')
451
391
 
452
392
    def write_directive(self, filename, source, target, revision_id,
487
427
        branch_b.add('file2')
488
428
        branch_b.commit('added file2', rev_id='rev2b')
489
429
        branch_b.merge_from_branch(branch_a.branch)
490
 
        self.assertPathExists('branch_b/file1')
 
430
        self.failUnlessExists('branch_b/file1')
491
431
        branch_b.commit('merged branch_a', rev_id='rev3b')
492
432
 
493
433
        # It works if the revid has an interger revno
494
434
        self.run_bzr('merge -d target -r revid:rev2a branch_a')
495
 
        self.assertPathExists('target/file1')
496
 
        self.assertPathDoesNotExist('target/file2')
 
435
        self.failUnlessExists('target/file1')
 
436
        self.failIfExists('target/file2')
497
437
        target.revert()
498
438
 
499
439
        # It should work if the revid has no integer revno
500
440
        self.run_bzr('merge -d target -r revid:rev2a branch_b')
501
 
        self.assertPathExists('target/file1')
502
 
        self.assertPathDoesNotExist('target/file2')
 
441
        self.failUnlessExists('target/file1')
 
442
        self.failIfExists('target/file2')
503
443
 
504
444
    def assertDirectoryContent(self, directory, entries, message=''):
505
445
        """Assert whether entries (file or directories) exist in a directory.
551
491
        out, err = self.run_bzr(['merge', '-d', 'a', 'b'])
552
492
        self.assertContainsRe(err, 'Warning: criss-cross merge encountered.')
553
493
 
 
494
    def test_merge_force(self):
 
495
        tree_a = self.make_branch_and_tree('a')
 
496
        self.build_tree(['a/foo'])
 
497
        tree_a.add(['foo'])
 
498
        tree_a.commit('add file')
 
499
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
 
500
        self.build_tree_contents([('a/foo', 'change 1')])
 
501
        tree_a.commit('change file')
 
502
        tree_b.merge_from_branch(tree_a.branch)
 
503
        tree_a.commit('empty change to allow merge to run')
 
504
        self.run_bzr(['merge', '../a', '--force'], working_dir='b')
 
505
 
554
506
    def test_merge_from_submit(self):
555
507
        tree_a = self.make_branch_and_tree('a')
556
 
        tree_a.commit('test')
557
508
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
558
509
        tree_c = tree_a.bzrdir.sprout('c').open_workingtree()
559
510
        out, err = self.run_bzr(['merge', '-d', 'c'])
560
 
        self.assertContainsRe(err,
561
 
                              'Merging from remembered parent location .*a\/')
562
 
        tree_c.branch.lock_write()
563
 
        try:
564
 
            tree_c.branch.set_submit_branch(tree_b.bzrdir.root_transport.base)
565
 
        finally:
566
 
            tree_c.branch.unlock()
 
511
        self.assertContainsRe(err, 'Merging from remembered parent location .*a\/')
 
512
        tree_c.branch.set_submit_branch(tree_b.bzrdir.root_transport.base)
567
513
        out, err = self.run_bzr(['merge', '-d', 'c'])
568
 
        self.assertContainsRe(err,
569
 
                              'Merging from remembered submit location .*b\/')
 
514
        self.assertContainsRe(err, 'Merging from remembered submit location .*b\/')
570
515
 
571
516
    def test_remember_sets_submit(self):
572
517
        tree_a = self.make_branch_and_tree('a')
573
 
        tree_a.commit('rev1')
574
518
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
575
519
        self.assertIs(tree_b.branch.get_submit_branch(), None)
576
520
 
577
521
        # Remember should not happen if using default from parent
578
522
        out, err = self.run_bzr(['merge', '-d', 'b'])
579
 
        refreshed = workingtree.WorkingTree.open('b')
580
 
        self.assertIs(refreshed.branch.get_submit_branch(), None)
 
523
        self.assertIs(tree_b.branch.get_submit_branch(), None)
581
524
 
582
525
        # Remember should happen if user supplies location
583
526
        out, err = self.run_bzr(['merge', '-d', 'b', 'a'])
584
 
        refreshed = workingtree.WorkingTree.open('b')
585
 
        self.assertEqual(refreshed.branch.get_submit_branch(),
 
527
        self.assertEqual(tree_b.branch.get_submit_branch(),
586
528
                         tree_a.bzrdir.root_transport.base)
587
529
 
588
 
    def test_no_remember_dont_set_submit(self):
589
 
        tree_a = self.make_branch_and_tree('a')
590
 
        self.build_tree_contents([('a/file', "a\n")])
591
 
        tree_a.add('file')
592
 
        tree_a.commit('rev1')
593
 
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
594
 
        self.assertIs(tree_b.branch.get_submit_branch(), None)
595
 
 
596
 
        # Remember should not happen if using default from parent
597
 
        out, err = self.run_bzr(['merge', '-d', 'b', '--no-remember'])
598
 
        self.assertEqual(None, tree_b.branch.get_submit_branch())
599
 
 
600
 
        # Remember should not happen if user supplies location but ask for not
601
 
        # remembering it
602
 
        out, err = self.run_bzr(['merge', '-d', 'b', '--no-remember', 'a'])
603
 
        self.assertEqual(None, tree_b.branch.get_submit_branch())
604
 
 
605
530
    def test_weave_cherrypick(self):
606
531
        this_tree = self.make_branch_and_tree('this')
607
532
        self.build_tree_contents([('this/file', "a\n")])
630
555
        tree_a.merge_from_branch(tree_b.branch)
631
556
        self.build_tree_contents([('a/file',
632
557
                                   'base-contents\nthis-contents\n')])
633
 
        tree_a.set_conflicts(conflicts.ConflictList())
 
558
        tree_a.set_conflicts(ConflictList())
634
559
        tree_b.merge_from_branch(tree_a.branch)
635
560
        self.build_tree_contents([('b/file',
636
561
                                   'base-contents\nother-contents\n')])
637
 
        tree_b.set_conflicts(conflicts.ConflictList())
 
562
        tree_b.set_conflicts(ConflictList())
638
563
        tree_a.commit('', rev_id='rev3a')
639
564
        tree_b.commit('', rev_id='rev3b')
640
565
        out, err = self.run_bzr(['merge', '-d', 'a', 'b', '--lca'], retcode=1)
657
582
        self.addCleanup(this_tree.unlock)
658
583
        self.assertEqual([],
659
584
                         list(this_tree.iter_changes(this_tree.basis_tree())))
660
 
 
661
 
    def test_merge_missing_second_revision_spec(self):
662
 
        """Merge uses branch basis when the second revision is unspecified."""
663
 
        this = self.make_branch_and_tree('this')
664
 
        this.commit('rev1')
665
 
        other = self.make_branch_and_tree('other')
666
 
        self.build_tree(['other/other_file'])
667
 
        other.add('other_file')
668
 
        other.commit('rev1b')
669
 
        self.run_bzr('merge -d this other -r0..')
670
 
        self.assertPathExists('this/other_file')
671
 
 
672
 
    def test_merge_interactive_unlocks_branch(self):
673
 
        this = self.make_branch_and_tree('this')
674
 
        this.commit('empty commit')
675
 
        other = this.bzrdir.sprout('other').open_workingtree()
676
 
        other.commit('empty commit 2')
677
 
        self.run_bzr('merge -i -d this other')
678
 
        this.lock_write()
679
 
        this.unlock()
680
 
 
681
 
    def test_merge_fetches_tags(self):
682
 
        """Tags are updated by merge, and revisions named in those tags are
683
 
        fetched.
684
 
        """
685
 
        # Make a source, sprout a target off it
686
 
        builder = self.make_branch_builder('source')
687
 
        builder.build_commit(message="Rev 1", rev_id='rev-1')
688
 
        source = builder.get_branch()
689
 
        target_bzrdir = source.bzrdir.sprout('target')
690
 
        # Add a non-ancestry tag to source
691
 
        builder.build_commit(message="Rev 2a", rev_id='rev-2a')
692
 
        source.tags.set_tag('tag-a', 'rev-2a')
693
 
        source.set_last_revision_info(1, 'rev-1')
694
 
        source.get_config_stack().set('branch.fetch_tags', True)
695
 
        builder.build_commit(message="Rev 2b", rev_id='rev-2b')
696
 
        # Merge from source
697
 
        self.run_bzr('merge -d target source')
698
 
        target = target_bzrdir.open_branch()
699
 
        # The tag is present, and so is its revision.
700
 
        self.assertEqual('rev-2a', target.tags.lookup_tag('tag-a'))
701
 
        target.repository.get_revision('rev-2a')
702
 
 
703
 
 
704
 
class TestMergeRevisionRange(tests.TestCaseWithTransport):
705
 
 
706
 
    scenarios = (('whole-tree', dict(context='.')),
707
 
                 ('file-only', dict(context='a')))
708
 
 
709
 
    def setUp(self):
710
 
        super(TestMergeRevisionRange, self).setUp()
711
 
        self.tree = self.make_branch_and_tree(".")
712
 
        self.tree.commit('initial commit')
713
 
        for f in ("a", "b"):
714
 
            self.build_tree([f])
715
 
            self.tree.add(f)
716
 
            self.tree.commit("added " + f)
717
 
 
718
 
    def test_merge_reversed_revision_range(self):
719
 
        self.run_bzr("merge -r 2..1 " + self.context)
720
 
        self.assertPathDoesNotExist("a")
721
 
        self.assertPathExists("b")
722
 
 
723
 
 
724
 
class TestMergeScript(script.TestCaseWithTransportAndScript):
725
 
    def test_merge_empty_branch(self):
726
 
        source = self.make_branch_and_tree('source')
727
 
        self.build_tree(['source/a'])
728
 
        source.add('a')
729
 
        source.commit('Added a', rev_id='rev1')
730
 
        target = self.make_branch_and_tree('target')
731
 
        self.run_script("""\
732
 
$ bzr merge -d target source
733
 
2>bzr: ERROR: Merging into empty branches not currently supported, https://bugs.launchpad.net/bzr/+bug/308562
734
 
""")
735
 
 
736
 
class TestMergeForce(tests.TestCaseWithTransport):
737
 
 
738
 
    def setUp(self):
739
 
        super(TestMergeForce, self).setUp()
740
 
        self.tree_a = self.make_branch_and_tree('a')
741
 
        self.build_tree(['a/foo'])
742
 
        self.tree_a.add(['foo'])
743
 
        self.tree_a.commit('add file')
744
 
        self.tree_b = self.tree_a.bzrdir.sprout('b').open_workingtree()
745
 
        self.build_tree_contents([('a/foo', 'change 1')])
746
 
        self.tree_a.commit('change file')
747
 
        self.tree_b.merge_from_branch(self.tree_a.branch)
748
 
 
749
 
    def test_merge_force(self):
750
 
        self.tree_a.commit('empty change to allow merge to run')
751
 
        # Second merge on top of the uncommitted one
752
 
        self.run_bzr(['merge', '../a', '--force'], working_dir='b')
753
 
 
754
 
 
755
 
    def test_merge_with_uncommitted_changes(self):
756
 
        self.run_bzr_error(['Working tree .* has uncommitted changes'],
757
 
                           ['merge', '../a'], working_dir='b')
758
 
 
759
 
    def test_merge_with_pending_merges(self):
760
 
        # Revert the changes keeping the pending merge
761
 
        self.run_bzr(['revert', 'b'])
762
 
        self.run_bzr_error(['Working tree .* has uncommitted changes'],
763
 
                           ['merge', '../a'], working_dir='b')