← 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: Ian Clatworthy
  • Date: 2009-12-03 23:21:16 UTC
  • mfrom: (4852.4.1 RCStoVCS)
  • mto: This revision was merged to the branch mainline in revision 4860.
  • Revision ID: ian.clatworthy@canonical.com-20091203232116-f8igfvc6muqrn4yx
Revision Control -> Version Control in docs

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
1
 
# Copyright (C) 2006-2012 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
24
from bzrlib import (
28
25
    branch,
 
26
    bzrdir,
29
27
    conflicts,
30
 
    controldir,
 
28
    errors,
31
29
    merge_directive,
32
30
    osutils,
33
31
    tests,
34
32
    urlutils,
35
33
    workingtree,
36
34
    )
37
 
from bzrlib.tests import (
38
 
    scenarios,
39
 
    script,
40
 
    )
41
 
 
42
 
 
43
 
load_tests = scenarios.load_tests_apply_scenarios
44
35
 
45
36
 
46
37
class TestMerge(tests.TestCaseWithTransport):
75
66
        return tree, other
76
67
 
77
68
    def test_merge_reprocess(self):
78
 
        d = controldir.ControlDir.create_standalone_workingtree('.')
 
69
        d = bzrdir.BzrDir.create_standalone_workingtree('.')
79
70
        d.commit('h')
80
71
        self.run_bzr('merge . --reprocess --merge-type weave')
81
72
 
88
79
 
89
80
        self.build_tree_contents([('a/hello', 'quuux')])
90
81
        # 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')
 
82
        os.chdir('a')
 
83
        self.run_bzr('merge ../b', retcode=3)
 
84
        a = workingtree.WorkingTree.open('.')
93
85
        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'])
 
86
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type blooof',
 
87
                    retcode=3)
 
88
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type merge3')
 
89
        a_tree.revert(backups=False)
 
90
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type weave')
 
91
        a_tree.revert(backups=False)
 
92
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type lca')
 
93
        a_tree.revert(backups=False)
105
94
        self.run_bzr_error(['Show-base is not supported for this merge type'],
106
95
                           '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')
 
96
                           ' --show-base')
 
97
        a_tree.revert(backups=False)
 
98
        self.run_bzr('merge ../b -r last:1..last:1 --reprocess')
 
99
        a_tree.revert(backups=False)
 
100
        self.run_bzr('merge ../b -r last:1')
 
101
        self.check_file_contents('goodbye', 'quux')
114
102
        # Merging a branch pulls its revision into the tree
115
 
        b = branch.Branch.open('b')
 
103
        b = branch.Branch.open('../b')
116
104
        b_tip = b.last_revision()
117
 
        self.assertTrue(a.branch.repository.has_revision(b_tip))
 
105
        self.failUnless(a.branch.repository.has_revision(b_tip))
118
106
        self.assertEqual([a_tip, b_tip], a.get_parent_ids())
119
107
        a_tree.revert(backups=False)
120
 
        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3,
121
 
                                working_dir='a')
 
108
        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3)
122
109
        self.assertTrue("Not a branch" in err)
123
110
        self.run_bzr('merge -r revno:%d:./..revno:%d:../b'
124
 
                    %(ancestor,b.revno()), working_dir='a')
 
111
                    %(ancestor,b.revno()))
125
112
        self.assertEquals(a.get_parent_ids(),
126
113
                          [a.branch.last_revision(), b.last_revision()])
127
 
        self.check_file_contents('a/goodbye', 'quux')
 
114
        self.check_file_contents('goodbye', 'quux')
128
115
        a_tree.revert(backups=False)
129
 
        self.run_bzr('merge -r revno:%d:../b'%b.revno(), working_dir='a')
 
116
        self.run_bzr('merge -r revno:%d:../b'%b.revno())
130
117
        self.assertEquals(a.get_parent_ids(),
131
118
                          [a.branch.last_revision(), b.last_revision()])
132
119
        a_tip = a.commit('merged')
133
 
        self.run_bzr('merge ../b -r last:1', working_dir='a')
 
120
        self.run_bzr('merge ../b -r last:1')
134
121
        self.assertEqual([a_tip], a.get_parent_ids())
135
122
 
136
123
    def test_merge_defaults_to_reprocess(self):
215
202
            ('b/b.txt', 'hello\nsomething\n'),
216
203
            ('b/sub/c.txt', 'hello\nsomething\n')])
217
204
        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')
 
205
        os.chdir('b')
 
206
        self.run_bzr('merge ../a/', retcode=1)
 
207
        self.failUnlessExists('sub/a.txt.THIS')
 
208
        self.failUnlessExists('sub/a.txt.BASE')
 
209
        os.chdir('../a')
 
210
        self.run_bzr('merge ../b/', retcode=1)
 
211
        self.failUnlessExists('sub/a.txt.OTHER')
 
212
        self.failUnlessExists('sub/a.txt.BASE')
242
213
 
243
214
    def test_merge_remember(self):
244
215
        """Merge changes from one branch to another, test submit location."""
262
233
        branch_b.set_parent(None)
263
234
        self.assertEqual(None, branch_b.get_parent())
264
235
        # test merge for failure without parent set
265
 
        out = self.run_bzr('merge', retcode=3, working_dir='branch_b')
 
236
        os.chdir('branch_b')
 
237
        out = self.run_bzr('merge', retcode=3)
266
238
        self.assertEquals(out,
267
239
                ('','bzr: ERROR: No location specified or remembered\n'))
268
240
 
269
241
        # test uncommitted changes
270
 
        self.build_tree(['branch_b/d'])
 
242
        self.build_tree(['d'])
271
243
        tree_b.add('d')
272
244
        self.run_bzr_error(['Working tree ".*" has uncommitted changes'],
273
 
                           'merge', working_dir='branch_b')
 
245
                           'merge')
274
246
 
275
247
        # merge should now pass and implicitly remember merge location
276
248
        tree_b.commit('commit d')
277
 
        out, err = self.run_bzr('merge ../branch_a', working_dir='branch_b')
 
249
        out, err = self.run_bzr('merge ../branch_a')
278
250
 
279
251
        base = urlutils.local_path_from_url(branch_a.base)
280
252
        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
253
        self.assertEquals(osutils.abspath(branch_b.get_submit_branch()),
284
254
                          osutils.abspath(parent))
285
255
        # test implicit --remember when committing new file
286
 
        self.build_tree(['branch_b/e'])
 
256
        self.build_tree(['e'])
287
257
        tree_b.add('e')
288
258
        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,))
 
259
        out, err = self.run_bzr('merge')
 
260
        self.assertStartsWith(err,
 
261
                          'Merging from remembered submit location %s\n' % (base,))
292
262
        # re-open tree as external run_bzr modified it
293
263
        tree_b = branch_b.bzrdir.open_workingtree()
294
264
        tree_b.commit('merge branch_a')
295
265
        # test explicit --remember
296
 
        out, err = self.run_bzr('merge ../branch_c --remember',
297
 
                                working_dir='branch_b')
 
266
        out, err = self.run_bzr('merge ../branch_c --remember')
298
267
        self.assertEquals(out, '')
299
268
        self.assertEquals(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
269
        self.assertEquals(osutils.abspath(branch_b.get_submit_branch()),
303
270
                          osutils.abspath(branch_c.bzrdir.root_transport.base))
304
271
        # re-open tree as external run_bzr modified it
318
285
 
319
286
        self.build_tree_contents([('branch_b/a', 'goodbye')])
320
287
        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')
 
288
        os.chdir('branch_b')
 
289
        self.run_bzr('bundle ../branch_a -o ../bundle')
 
290
        os.chdir('../branch_a')
 
291
        self.run_bzr('merge ../bundle', retcode=1)
323
292
        testament_a = Testament.from_revision(tree_a.branch.repository,
324
293
                                              tree_b.get_parent_ids()[0])
325
294
        testament_b = Testament.from_revision(tree_b.branch.repository,
329
298
        tree_a.set_conflicts(conflicts.ConflictList())
330
299
        tree_a.commit('message')
331
300
        # it is legal to attempt to merge an already-merged bundle
332
 
        err = self.run_bzr('merge ../bundle', working_dir='branch_a')[1]
 
301
        output = self.run_bzr('merge ../bundle')[1]
333
302
        # but it does nothing
334
303
        self.assertFalse(tree_a.changes_from(tree_a.basis_tree()).has_changed())
335
 
        self.assertEqual('Nothing to do.\n', err)
 
304
        self.assertEqual('Nothing to do.\n', output)
336
305
 
337
306
    def test_merge_uncommitted(self):
338
307
        """Check that merge --uncommitted behaves properly"""
341
310
        tree_a.add(['file_1', 'file_2'])
342
311
        tree_a.commit('commit 1')
343
312
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
344
 
        self.assertPathExists('b/file_1')
 
313
        self.failUnlessExists('b/file_1')
345
314
        tree_a.rename_one('file_1', 'file_i')
346
315
        tree_a.commit('commit 2')
347
316
        tree_a.rename_one('file_2', 'file_ii')
 
317
        ## os.chdir('b')
348
318
        self.run_bzr('merge a --uncommitted -d b')
349
 
        self.assertPathExists('b/file_1')
350
 
        self.assertPathExists('b/file_ii')
 
319
        self.failUnlessExists('b/file_1')
 
320
        self.failUnlessExists('b/file_ii')
351
321
        tree_b.revert()
352
322
        self.run_bzr_error(('Cannot use --uncommitted and --revision',),
353
323
                           'merge /a --uncommitted -r1 -d b')
359
329
        tree_a.bzrdir.sprout('tree_b')
360
330
        self.build_tree(['tree_a/file1', 'tree_a/file2'])
361
331
        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')
 
332
        os.chdir('tree_b')
 
333
        self.run_bzr(['merge', '--uncommitted', '../tree_a/file1'])
 
334
        self.failUnlessExists('file1')
 
335
        self.failIfExists('file2')
376
336
 
377
337
    def pullable_branch(self):
378
338
        tree_a = self.make_branch_and_tree('a')
379
 
        self.build_tree_contents([('a/file', 'bar\n')])
 
339
        self.build_tree(['a/file'])
380
340
        tree_a.add(['file'])
381
341
        self.id1 = tree_a.commit('commit 1')
382
342
 
383
343
        tree_b = self.make_branch_and_tree('b')
384
344
        tree_b.pull(tree_a.branch)
385
 
        self.build_tree_contents([('b/file', 'foo\n')])
 
345
        file('b/file', 'wb').write('foo')
386
346
        self.id2 = tree_b.commit('commit 2')
387
347
 
388
348
    def test_merge_pull(self):
389
349
        self.pullable_branch()
390
 
        (out, err) = self.run_bzr('merge --pull ../b', working_dir='a')
 
350
        os.chdir('a')
 
351
        (out, err) = self.run_bzr('merge --pull ../b')
391
352
        self.assertContainsRe(out, 'Now on revision 2\\.')
392
 
        tree_a = workingtree.WorkingTree.open('a')
 
353
        tree_a = workingtree.WorkingTree.open('.')
393
354
        self.assertEqual([self.id2], tree_a.get_parent_ids())
394
355
 
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
356
    def test_merge_kind_change(self):
411
357
        tree_a = self.make_branch_and_tree('tree_a')
412
358
        self.build_tree_contents([('tree_a/file', 'content_1')])
416
362
        os.unlink('tree_a/file')
417
363
        self.build_tree(['tree_a/file/'])
418
364
        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'))
 
365
        os.chdir('tree_b')
 
366
        self.run_bzr('merge ../tree_a')
 
367
        self.assertEqual('directory', osutils.file_kind('file'))
421
368
        tree_b.revert()
422
 
        self.assertEqual('file', osutils.file_kind('tree_b/file'))
423
 
        self.build_tree_contents([('tree_b/file', 'content_2')])
 
369
        self.assertEqual('file', osutils.file_kind('file'))
 
370
        self.build_tree_contents([('file', 'content_2')])
424
371
        tree_b.commit('content change')
425
 
        self.run_bzr('merge ../tree_a', retcode=1, working_dir='tree_b')
 
372
        self.run_bzr('merge ../tree_a', retcode=1)
426
373
        self.assertEqual(tree_b.conflicts(),
427
374
                         [conflicts.ContentsConflict('file',
428
375
                                                     file_id='file-id')])
430
377
    def test_directive_cherrypick(self):
431
378
        source = self.make_branch_and_tree('source')
432
379
        source.commit("nothing")
433
 
        # see https://bugs.launchpad.net/bzr/+bug/409688 - trying to
 
380
        # see https://bugs.edge.launchpad.net/bzr/+bug/409688 - trying to
434
381
        # cherrypick from one branch into another unrelated branch with a
435
382
        # different root id will give shape conflicts.  as a workaround we
436
383
        # make sure they share the same root id.
445
392
        self.write_directive('directive', source.branch, 'target', 'rev2',
446
393
                             'rev1')
447
394
        out, err = self.run_bzr('merge -d target directive')
448
 
        self.assertPathDoesNotExist('target/a')
449
 
        self.assertPathExists('target/b')
 
395
        self.failIfExists('target/a')
 
396
        self.failUnlessExists('target/b')
450
397
        self.assertContainsRe(err, 'Performing cherrypick')
451
398
 
452
399
    def write_directive(self, filename, source, target, revision_id,
487
434
        branch_b.add('file2')
488
435
        branch_b.commit('added file2', rev_id='rev2b')
489
436
        branch_b.merge_from_branch(branch_a.branch)
490
 
        self.assertPathExists('branch_b/file1')
 
437
        self.failUnlessExists('branch_b/file1')
491
438
        branch_b.commit('merged branch_a', rev_id='rev3b')
492
439
 
493
440
        # It works if the revid has an interger revno
494
441
        self.run_bzr('merge -d target -r revid:rev2a branch_a')
495
 
        self.assertPathExists('target/file1')
496
 
        self.assertPathDoesNotExist('target/file2')
 
442
        self.failUnlessExists('target/file1')
 
443
        self.failIfExists('target/file2')
497
444
        target.revert()
498
445
 
499
446
        # It should work if the revid has no integer revno
500
447
        self.run_bzr('merge -d target -r revid:rev2a branch_b')
501
 
        self.assertPathExists('target/file1')
502
 
        self.assertPathDoesNotExist('target/file2')
 
448
        self.failUnlessExists('target/file1')
 
449
        self.failIfExists('target/file2')
503
450
 
504
451
    def assertDirectoryContent(self, directory, entries, message=''):
505
452
        """Assert whether entries (file or directories) exist in a directory.
553
500
 
554
501
    def test_merge_from_submit(self):
555
502
        tree_a = self.make_branch_and_tree('a')
556
 
        tree_a.commit('test')
557
503
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
558
504
        tree_c = tree_a.bzrdir.sprout('c').open_workingtree()
559
505
        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()
 
506
        self.assertContainsRe(err, 'Merging from remembered parent location .*a\/')
 
507
        tree_c.branch.set_submit_branch(tree_b.bzrdir.root_transport.base)
567
508
        out, err = self.run_bzr(['merge', '-d', 'c'])
568
 
        self.assertContainsRe(err,
569
 
                              'Merging from remembered submit location .*b\/')
 
509
        self.assertContainsRe(err, 'Merging from remembered submit location .*b\/')
570
510
 
571
511
    def test_remember_sets_submit(self):
572
512
        tree_a = self.make_branch_and_tree('a')
573
 
        tree_a.commit('rev1')
574
513
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
575
514
        self.assertIs(tree_b.branch.get_submit_branch(), None)
576
515
 
577
516
        # Remember should not happen if using default from parent
578
517
        out, err = self.run_bzr(['merge', '-d', 'b'])
579
 
        refreshed = workingtree.WorkingTree.open('b')
580
 
        self.assertIs(refreshed.branch.get_submit_branch(), None)
 
518
        self.assertIs(tree_b.branch.get_submit_branch(), None)
581
519
 
582
520
        # Remember should happen if user supplies location
583
521
        out, err = self.run_bzr(['merge', '-d', 'b', 'a'])
584
 
        refreshed = workingtree.WorkingTree.open('b')
585
 
        self.assertEqual(refreshed.branch.get_submit_branch(),
 
522
        self.assertEqual(tree_b.branch.get_submit_branch(),
586
523
                         tree_a.bzrdir.root_transport.base)
587
524
 
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.assertEquals(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
525
    def test_weave_cherrypick(self):
606
526
        this_tree = self.make_branch_and_tree('this')
607
527
        self.build_tree_contents([('this/file', "a\n")])
667
587
        other.add('other_file')
668
588
        other.commit('rev1b')
669
589
        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')
 
590
        self.failUnlessExists('this/other_file')
 
591
 
 
592
    def test_merge_reversed_revision_range(self):
 
593
        tree = self.make_branch_and_tree(".")
713
594
        for f in ("a", "b"):
714
595
            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
 
""")
 
596
            tree.add(f)
 
597
            tree.commit("added "+f)
 
598
        for context in (".", "", "a"):
 
599
            self.run_bzr("merge -r 1..0 " + context)
 
600
            self.failIfExists("a")
 
601
            tree.revert()
 
602
            self.failUnlessExists("a")
 
603
 
735
604
 
736
605
class TestMergeForce(tests.TestCaseWithTransport):
737
606