/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 breezy/tests/blackbox/test_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2020-05-06 02:13:25 UTC
  • mfrom: (7490.7.21 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200506021325-awbmmqu1zyorz7sj
Merge 3.1 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_merge.py
48
48
    def example_branch(self, path='.'):
49
49
        tree = self.make_branch_and_tree(path)
50
50
        self.build_tree_contents([
51
 
            (osutils.pathjoin(path, 'hello'), 'foo'),
52
 
            (osutils.pathjoin(path, 'goodbye'), 'baz')])
 
51
            (osutils.pathjoin(path, 'hello'), b'foo'),
 
52
            (osutils.pathjoin(path, 'goodbye'), b'baz')])
53
53
        tree.add('hello')
54
54
        tree.commit(message='setup')
55
55
        tree.add('goodbye')
64
64
        """
65
65
        builder = self.make_branch_builder('branch')
66
66
        builder.build_snapshot(None,
67
 
            [('add', ('', 'root-id', 'directory', None)),
68
 
             ('add', ('fname', 'f-id', 'file', 'a\nb\nc\n'))],
69
 
            revision_id='rev1')
70
 
        builder.build_snapshot(['rev1'],
71
 
            [('modify', ('f-id', 'a\nB\nD\n'))],
72
 
            revision_id='rev2other')
 
67
                               [('add', ('', b'root-id', 'directory', None)),
 
68
                                ('add', ('fname', b'f-id', 'file', b'a\nb\nc\n'))],
 
69
                               revision_id=b'rev1')
 
70
        builder.build_snapshot([b'rev1'],
 
71
                               [('modify', ('fname', b'a\nB\nD\n'))],
 
72
                               revision_id=b'rev2other')
73
73
        other = builder.get_branch().controldir.sprout('other').open_branch()
74
 
        builder.build_snapshot(['rev1'],
75
 
            [('modify', ('f-id', 'a\nB\nC\n'))], revision_id='rev2this')
 
74
        builder.build_snapshot([b'rev1'],
 
75
                               [('modify', ('fname', b'a\nB\nC\n'))], revision_id=b'rev2this')
76
76
        tree = builder.get_branch().create_checkout('tree', lightweight=True)
77
77
        return tree, other
78
78
 
85
85
        a_tree = self.example_branch('a')
86
86
        ancestor = a_tree.branch.revno()
87
87
        b_tree = a_tree.controldir.sprout('b').open_workingtree()
88
 
        self.build_tree_contents([('b/goodbye', 'quux')])
 
88
        self.build_tree_contents([('b/goodbye', b'quux')])
89
89
        b_tree.commit(message="more u's are always good")
90
90
 
91
 
        self.build_tree_contents([('a/hello', 'quuux')])
 
91
        self.build_tree_contents([('a/hello', b'quuux')])
92
92
        # We can't merge when there are in-tree changes
93
93
        self.run_bzr('merge ../b', retcode=3, working_dir='a')
94
94
        a = workingtree.WorkingTree.open('a')
112
112
                     working_dir='a')
113
113
        a_tree.revert(backups=False)
114
114
        self.run_bzr('merge ../b -r last:1', working_dir='a')
115
 
        self.check_file_contents('a/goodbye', 'quux')
 
115
        self.check_file_contents('a/goodbye', b'quux')
116
116
        # Merging a branch pulls its revision into the tree
117
117
        b = branch.Branch.open('b')
118
118
        b_tip = b.last_revision()
123
123
                                working_dir='a')
124
124
        self.assertTrue("Not a branch" in err)
125
125
        self.run_bzr('merge -r revno:%d:./..revno:%d:../b'
126
 
                    %(ancestor, b.revno()), working_dir='a')
 
126
                     % (ancestor, b.revno()), working_dir='a')
127
127
        self.assertEqual(a.get_parent_ids(),
128
 
                          [a.branch.last_revision(), b.last_revision()])
129
 
        self.check_file_contents('a/goodbye', 'quux')
 
128
                         [a.branch.last_revision(), b.last_revision()])
 
129
        self.check_file_contents('a/goodbye', b'quux')
130
130
        a_tree.revert(backups=False)
131
 
        self.run_bzr('merge -r revno:%d:../b'%b.revno(), working_dir='a')
 
131
        self.run_bzr('merge -r revno:%d:../b' % b.revno(), working_dir='a')
132
132
        self.assertEqual(a.get_parent_ids(),
133
 
                          [a.branch.last_revision(), b.last_revision()])
 
133
                         [a.branch.last_revision(), b.last_revision()])
134
134
        a_tip = a.commit('merged')
135
135
        self.run_bzr('merge ../b -r last:1', working_dir='a')
136
136
        self.assertEqual([a_tip], a.get_parent_ids())
141
141
        # 'show-base' is not set
142
142
        self.run_bzr('merge ../other', working_dir='tree',
143
143
                     retcode=1)
144
 
        self.assertEqualDiff('a\n'
145
 
                             'B\n'
146
 
                             '<<<<<<< TREE\n'
147
 
                             'C\n'
148
 
                             '=======\n'
149
 
                             'D\n'
150
 
                             '>>>>>>> MERGE-SOURCE\n',
151
 
                             tree.get_file_text(tree.id2path('f-id')))
 
144
        self.assertEqualDiff(b'a\n'
 
145
                             b'B\n'
 
146
                             b'<<<<<<< TREE\n'
 
147
                             b'C\n'
 
148
                             b'=======\n'
 
149
                             b'D\n'
 
150
                             b'>>>>>>> MERGE-SOURCE\n',
 
151
                             tree.get_file_text('fname'))
152
152
 
153
153
    def test_merge_explicit_reprocess_show_base(self):
154
154
        tree, other = self.create_conflicting_branches()
162
162
        # Explicitly disable reprocess
163
163
        self.run_bzr('merge ../other --no-reprocess', working_dir='tree',
164
164
                     retcode=1)
165
 
        self.assertEqualDiff('a\n'
166
 
                             '<<<<<<< TREE\n'
167
 
                             'B\n'
168
 
                             'C\n'
169
 
                             '=======\n'
170
 
                             'B\n'
171
 
                             'D\n'
172
 
                             '>>>>>>> MERGE-SOURCE\n',
173
 
                             tree.get_file_text(tree.id2path('f-id')))
 
165
        self.assertEqualDiff(b'a\n'
 
166
                             b'<<<<<<< TREE\n'
 
167
                             b'B\n'
 
168
                             b'C\n'
 
169
                             b'=======\n'
 
170
                             b'B\n'
 
171
                             b'D\n'
 
172
                             b'>>>>>>> MERGE-SOURCE\n',
 
173
                             tree.get_file_text('fname'))
174
174
 
175
175
    def test_merge_override_show_base(self):
176
176
        tree, other = self.create_conflicting_branches()
177
177
        # Setting '--show-base' will auto-disable '--reprocess'
178
178
        self.run_bzr('merge ../other --show-base', working_dir='tree',
179
179
                     retcode=1)
180
 
        self.assertEqualDiff('a\n'
181
 
                             '<<<<<<< TREE\n'
182
 
                             'B\n'
183
 
                             'C\n'
184
 
                             '||||||| BASE-REVISION\n'
185
 
                             'b\n'
186
 
                             'c\n'
187
 
                             '=======\n'
188
 
                             'B\n'
189
 
                             'D\n'
190
 
                             '>>>>>>> MERGE-SOURCE\n',
191
 
                             tree.get_file_text(tree.id2path('f-id')))
 
180
        self.assertEqualDiff(b'a\n'
 
181
                             b'<<<<<<< TREE\n'
 
182
                             b'B\n'
 
183
                             b'C\n'
 
184
                             b'||||||| BASE-REVISION\n'
 
185
                             b'b\n'
 
186
                             b'c\n'
 
187
                             b'=======\n'
 
188
                             b'B\n'
 
189
                             b'D\n'
 
190
                             b'>>>>>>> MERGE-SOURCE\n',
 
191
                             tree.get_file_text('fname'))
192
192
 
193
193
    def test_merge_with_missing_file(self):
194
194
        """Merge handles missing file conflicts"""
195
195
        self.build_tree_contents([
196
196
            ('a/',),
197
197
            ('a/sub/',),
198
 
            ('a/sub/a.txt', 'hello\n'),
199
 
            ('a/b.txt', 'hello\n'),
200
 
            ('a/sub/c.txt', 'hello\n')])
 
198
            ('a/sub/a.txt', b'hello\n'),
 
199
            ('a/b.txt', b'hello\n'),
 
200
            ('a/sub/c.txt', b'hello\n')])
201
201
        a_tree = self.make_branch_and_tree('a')
202
202
        a_tree.add(['sub', 'b.txt', 'sub/c.txt', 'sub/a.txt'])
203
203
        a_tree.commit(message='added a')
204
204
        b_tree = a_tree.controldir.sprout('b').open_workingtree()
205
205
        self.build_tree_contents([
206
 
            ('a/sub/a.txt', 'hello\nthere\n'),
207
 
            ('a/b.txt', 'hello\nthere\n'),
208
 
            ('a/sub/c.txt', 'hello\nthere\n')])
 
206
            ('a/sub/a.txt', b'hello\nthere\n'),
 
207
            ('a/b.txt', b'hello\nthere\n'),
 
208
            ('a/sub/c.txt', b'hello\nthere\n')])
209
209
        a_tree.commit(message='Added there')
210
210
        os.remove('a/sub/a.txt')
211
211
        os.remove('a/sub/c.txt')
213
213
        os.remove('a/b.txt')
214
214
        a_tree.commit(message='Removed a.txt')
215
215
        self.build_tree_contents([
216
 
            ('b/sub/a.txt', 'hello\nsomething\n'),
217
 
            ('b/b.txt', 'hello\nsomething\n'),
218
 
            ('b/sub/c.txt', 'hello\nsomething\n')])
 
216
            ('b/sub/a.txt', b'hello\nsomething\n'),
 
217
            ('b/b.txt', b'hello\nsomething\n'),
 
218
            ('b/sub/c.txt', b'hello\nsomething\n')])
219
219
        b_tree.commit(message='Modified a.txt')
220
220
 
221
221
        self.run_bzr('merge ../a/', retcode=1, working_dir='b')
230
230
        tree, other = self.create_conflicting_branches()
231
231
        self.run_bzr('merge ../other', working_dir='tree',
232
232
                     retcode=1)
233
 
        self.assertFileEqual('a\nb\nc\n', 'tree/fname.BASE')
234
 
        self.assertFileEqual('a\nB\nD\n', 'tree/fname.OTHER')
235
 
        self.assertFileEqual('a\nB\nC\n', 'tree/fname.THIS')
 
233
        self.assertFileEqual(b'a\nb\nc\n', 'tree/fname.BASE')
 
234
        self.assertFileEqual(b'a\nB\nD\n', 'tree/fname.OTHER')
 
235
        self.assertFileEqual(b'a\nB\nC\n', 'tree/fname.THIS')
236
236
 
237
237
    def test_weave_conflict_leaves_base_this_other_files(self):
238
238
        tree, other = self.create_conflicting_branches()
239
239
        self.run_bzr('merge ../other --weave', working_dir='tree',
240
240
                     retcode=1)
241
 
        self.assertFileEqual('a\nb\nc\n', 'tree/fname.BASE')
242
 
        self.assertFileEqual('a\nB\nD\n', 'tree/fname.OTHER')
243
 
        self.assertFileEqual('a\nB\nC\n', 'tree/fname.THIS')
 
241
        self.assertFileEqual(b'a\nb\nc\n', 'tree/fname.BASE')
 
242
        self.assertFileEqual(b'a\nB\nD\n', 'tree/fname.OTHER')
 
243
        self.assertFileEqual(b'a\nB\nC\n', 'tree/fname.THIS')
244
244
 
245
245
    def test_merge_remember(self):
246
246
        """Merge changes from one branch to another, test submit location."""
266
266
        # test merge for failure without parent set
267
267
        out = self.run_bzr('merge', retcode=3, working_dir='branch_b')
268
268
        self.assertEqual(out,
269
 
                ('', 'brz: ERROR: No location specified or remembered\n'))
 
269
                         ('', 'brz: ERROR: No location specified or remembered\n'))
270
270
 
271
271
        # test uncommitted changes
272
272
        self.build_tree(['branch_b/d'])
283
283
        # re-open branch as external run_brz modified it
284
284
        branch_b = branch_b.controldir.open_branch()
285
285
        self.assertEqual(osutils.abspath(branch_b.get_submit_branch()),
286
 
                          osutils.abspath(parent))
 
286
                         osutils.abspath(parent))
287
287
        # test implicit --remember when committing new file
288
288
        self.build_tree(['branch_b/e'])
289
289
        tree_b.add('e')
302
302
        # re-open branch as external run_brz modified it
303
303
        branch_b = branch_b.controldir.open_branch()
304
304
        self.assertEqual(osutils.abspath(branch_b.get_submit_branch()),
305
 
                          osutils.abspath(branch_c.controldir.root_transport.base))
 
305
                         osutils.abspath(branch_c.controldir.root_transport.base))
306
306
        # re-open tree as external run_brz modified it
307
307
        tree_b = branch_b.controldir.open_workingtree()
308
308
        tree_b.commit('merge branch_c')
309
309
 
310
310
    def test_merge_bundle(self):
311
 
        from breezy.testament import Testament
 
311
        from breezy.bzr.testament import Testament
312
312
        tree_a = self.make_branch_and_tree('branch_a')
313
 
        self.build_tree_contents([('branch_a/a', 'hello')])
 
313
        self.build_tree_contents([('branch_a/a', b'hello')])
314
314
        tree_a.add('a')
315
315
        tree_a.commit('message')
316
316
 
317
317
        tree_b = tree_a.controldir.sprout('branch_b').open_workingtree()
318
 
        self.build_tree_contents([('branch_a/a', 'hey there')])
 
318
        self.build_tree_contents([('branch_a/a', b'hey there')])
319
319
        tree_a.commit('message')
320
320
 
321
 
        self.build_tree_contents([('branch_b/a', 'goodbye')])
 
321
        self.build_tree_contents([('branch_b/a', b'goodbye')])
322
322
        tree_b.commit('message')
323
323
        self.run_bzr('bundle ../branch_a -o ../bundle', working_dir='branch_b')
324
324
        self.run_bzr('merge ../bundle', retcode=1, working_dir='branch_a')
327
327
        testament_b = Testament.from_revision(tree_b.branch.repository,
328
328
                                              tree_b.get_parent_ids()[0])
329
329
        self.assertEqualDiff(testament_a.as_text(),
330
 
                         testament_b.as_text())
 
330
                             testament_b.as_text())
331
331
        tree_a.set_conflicts(conflicts.ConflictList())
332
332
        tree_a.commit('message')
333
333
        # it is legal to attempt to merge an already-merged bundle
334
334
        err = self.run_bzr('merge ../bundle', working_dir='branch_a')[1]
335
335
        # but it does nothing
336
 
        self.assertFalse(tree_a.changes_from(tree_a.basis_tree()).has_changed())
 
336
        self.assertFalse(tree_a.changes_from(
 
337
            tree_a.basis_tree()).has_changed())
337
338
        self.assertEqual('Nothing to do.\n', err)
338
339
 
339
340
    def test_merge_uncommitted(self):
370
371
        """It should not be possible to merge changes from a file which
371
372
        does not exist."""
372
373
        tree_a = self.make_branch_and_tree('tree_a')
373
 
        self.build_tree_contents([('tree_a/file', 'bar\n')])
 
374
        self.build_tree_contents([('tree_a/file', b'bar\n')])
374
375
        tree_a.add(['file'])
375
376
        tree_a.commit('commit 1')
376
 
        self.run_bzr_error(('Path\(s\) do not exist: non/existing',),
 
377
        self.run_bzr_error(('Path\\(s\\) do not exist: non/existing',),
377
378
                           ['merge', 'non/existing'], working_dir='tree_a')
378
379
 
379
380
    def pullable_branch(self):
380
381
        tree_a = self.make_branch_and_tree('a')
381
 
        self.build_tree_contents([('a/file', 'bar\n')])
 
382
        self.build_tree_contents([('a/file', b'bar\n')])
382
383
        tree_a.add(['file'])
383
384
        self.id1 = tree_a.commit('commit 1')
384
385
 
385
386
        tree_b = self.make_branch_and_tree('b')
386
387
        tree_b.pull(tree_a.branch)
387
 
        self.build_tree_contents([('b/file', 'foo\n')])
 
388
        self.build_tree_contents([('b/file', b'foo\n')])
388
389
        self.id2 = tree_b.commit('commit 2')
389
390
 
390
391
    def test_merge_pull(self):
398
399
        self.pullable_branch()
399
400
        (out, err) = self.run_bzr('merge --pull --preview -d a b')
400
401
        self.assertThat(out, matchers.DocTestMatches(
401
 
"""=== modified file 'file'
 
402
            """=== modified file 'file'
402
403
--- file\t...
403
404
+++ file\t...
404
405
@@ -1,1 +1,1 @@
411
412
 
412
413
    def test_merge_kind_change(self):
413
414
        tree_a = self.make_branch_and_tree('tree_a')
414
 
        self.build_tree_contents([('tree_a/file', 'content_1')])
415
 
        tree_a.add('file', 'file-id')
 
415
        self.build_tree_contents([('tree_a/file', b'content_1')])
 
416
        tree_a.add('file', b'file-id')
416
417
        tree_a.commit('added file')
417
418
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
418
419
        os.unlink('tree_a/file')
422
423
        self.assertEqual('directory', osutils.file_kind('tree_b/file'))
423
424
        tree_b.revert()
424
425
        self.assertEqual('file', osutils.file_kind('tree_b/file'))
425
 
        self.build_tree_contents([('tree_b/file', 'content_2')])
 
426
        self.build_tree_contents([('tree_b/file', b'content_2')])
426
427
        tree_b.commit('content change')
427
428
        self.run_bzr('merge ../tree_a', retcode=1, working_dir='tree_b')
428
429
        self.assertEqual(tree_b.conflicts(),
439
440
        target = source.controldir.sprout('target').open_workingtree()
440
441
        self.build_tree(['source/a'])
441
442
        source.add('a')
442
 
        source.commit('Added a', rev_id='rev1')
 
443
        source.commit('Added a', rev_id=b'rev1')
443
444
        self.build_tree(['source/b'])
444
445
        source.add('b')
445
 
        source.commit('Added b', rev_id='rev2')
 
446
        source.commit('Added b', rev_id=b'rev2')
446
447
        target.commit('empty commit')
447
 
        self.write_directive('directive', source.branch, 'target', 'rev2',
448
 
                             'rev1')
 
448
        self.write_directive('directive', source.branch, 'target', b'rev2',
 
449
                             b'rev1')
449
450
        out, err = self.run_bzr('merge -d target directive')
450
451
        self.assertPathDoesNotExist('target/a')
451
452
        self.assertPathExists('target/b')
457
458
            source.repository, revision_id, 0, 0, target,
458
459
            base_revision_id=base_revision_id)
459
460
        if mangle_patch:
460
 
            md.patch = 'asdf\n'
461
 
        self.build_tree_contents([(filename, ''.join(md.to_lines()))])
 
461
            md.patch = b'asdf\n'
 
462
        self.build_tree_contents([(filename, b''.join(md.to_lines()))])
462
463
 
463
464
    def test_directive_verify_warning(self):
464
465
        source = self.make_branch_and_tree('source')
465
466
        self.build_tree(['source/a'])
466
467
        source.add('a')
467
 
        source.commit('Added a', rev_id='rev1')
 
468
        source.commit('Added a', rev_id=b'rev1')
468
469
        target = self.make_branch_and_tree('target')
469
470
        target.commit('empty commit')
470
 
        self.write_directive('directive', source.branch, 'target', 'rev1')
 
471
        self.write_directive('directive', source.branch, 'target', b'rev1')
471
472
        err = self.run_bzr('merge -d target directive')[1]
472
473
        self.assertNotContainsRe(err, 'Preview patch does not match changes')
473
474
        target.revert()
474
 
        self.write_directive('directive', source.branch, 'target', 'rev1',
 
475
        self.write_directive('directive', source.branch, 'target', b'rev1',
475
476
                             mangle_patch=True)
476
477
        err = self.run_bzr('merge -d target directive')[1]
477
478
        self.assertContainsRe(err, 'Preview patch does not match changes')
483
484
        branch_a = target.controldir.sprout('branch_a').open_workingtree()
484
485
        self.build_tree(['branch_a/file1'])
485
486
        branch_a.add('file1')
486
 
        branch_a.commit('added file1', rev_id='rev2a')
 
487
        branch_a.commit('added file1', rev_id=b'rev2a')
487
488
        branch_b = target.controldir.sprout('branch_b').open_workingtree()
488
489
        self.build_tree(['branch_b/file2'])
489
490
        branch_b.add('file2')
490
 
        branch_b.commit('added file2', rev_id='rev2b')
 
491
        branch_b.commit('added file2', rev_id=b'rev2b')
491
492
        branch_b.merge_from_branch(branch_a.branch)
492
493
        self.assertPathExists('branch_b/file1')
493
 
        branch_b.commit('merged branch_a', rev_id='rev3b')
 
494
        branch_b.commit('merged branch_a', rev_id=b'rev3b')
494
495
 
495
496
        # It works if the revid has an interger revno
496
497
        self.run_bzr('merge -d target -r revid:rev2a branch_a')
521
522
        # make source branch
522
523
        source = self.make_branch_and_tree('source')
523
524
        for f in ('a', 'b', 'c', 'd'):
524
 
            self.build_tree(['source/'+f])
 
525
            self.build_tree(['source/' + f])
525
526
            source.add(f)
526
 
            source.commit('added '+f, rev_id='rev_'+f)
 
527
            source.commit('added ' + f, rev_id=b'rev_' + f.encode('ascii'))
527
528
        # target branch
528
 
        target = source.controldir.sprout('target', 'rev_a').open_workingtree()
 
529
        target = source.controldir.sprout(
 
530
            'target', b'rev_a').open_workingtree()
529
531
        self.assertDirectoryContent('target', ['.bzr', 'a'])
530
532
        # pick 1 revision
531
533
        self.run_bzr('merge -d target -r revid:rev_b..revid:rev_c source')
541
543
 
542
544
    def test_merge_criss_cross(self):
543
545
        tree_a = self.make_branch_and_tree('a')
544
 
        tree_a.commit('', rev_id='rev1')
 
546
        tree_a.commit('', rev_id=b'rev1')
545
547
        tree_b = tree_a.controldir.sprout('b').open_workingtree()
546
 
        tree_a.commit('', rev_id='rev2a')
547
 
        tree_b.commit('', rev_id='rev2b')
 
548
        tree_a.commit('', rev_id=b'rev2a')
 
549
        tree_b.commit('', rev_id=b'rev2b')
548
550
        tree_a.merge_from_branch(tree_b.branch)
549
551
        tree_b.merge_from_branch(tree_a.branch)
550
 
        tree_a.commit('', rev_id='rev3a')
551
 
        tree_b.commit('', rev_id='rev3b')
 
552
        tree_a.commit('', rev_id=b'rev3a')
 
553
        tree_b.commit('', rev_id=b'rev3b')
552
554
        graph = tree_a.branch.repository.get_graph(tree_b.branch.repository)
553
555
        out, err = self.run_bzr(['merge', '-d', 'a', 'b'])
554
556
        self.assertContainsRe(err, 'Warning: criss-cross merge encountered.')
560
562
        tree_c = tree_a.controldir.sprout('c').open_workingtree()
561
563
        out, err = self.run_bzr(['merge', '-d', 'c'])
562
564
        self.assertContainsRe(err,
563
 
                              'Merging from remembered parent location .*a\/')
564
 
        tree_c.branch.lock_write()
565
 
        try:
566
 
            tree_c.branch.set_submit_branch(tree_b.controldir.root_transport.base)
567
 
        finally:
568
 
            tree_c.branch.unlock()
 
565
                              'Merging from remembered parent location .*a\\/')
 
566
        with tree_c.branch.lock_write():
 
567
            tree_c.branch.set_submit_branch(
 
568
                tree_b.controldir.root_transport.base)
569
569
        out, err = self.run_bzr(['merge', '-d', 'c'])
570
570
        self.assertContainsRe(err,
571
 
                              'Merging from remembered submit location .*b\/')
 
571
                              'Merging from remembered submit location .*b\\/')
572
572
 
573
573
    def test_remember_sets_submit(self):
574
574
        tree_a = self.make_branch_and_tree('a')
589
589
 
590
590
    def test_no_remember_dont_set_submit(self):
591
591
        tree_a = self.make_branch_and_tree('a')
592
 
        self.build_tree_contents([('a/file', "a\n")])
 
592
        self.build_tree_contents([('a/file', b"a\n")])
593
593
        tree_a.add('file')
594
594
        tree_a.commit('rev1')
595
595
        tree_b = tree_a.controldir.sprout('b').open_workingtree()
606
606
 
607
607
    def test_weave_cherrypick(self):
608
608
        this_tree = self.make_branch_and_tree('this')
609
 
        self.build_tree_contents([('this/file', "a\n")])
 
609
        self.build_tree_contents([('this/file', b"a\n")])
610
610
        this_tree.add('file')
611
611
        this_tree.commit('rev1')
612
612
        other_tree = this_tree.controldir.sprout('other').open_workingtree()
613
 
        self.build_tree_contents([('other/file', "a\nb\n")])
 
613
        self.build_tree_contents([('other/file', b"a\nb\n")])
614
614
        other_tree.commit('rev2b')
615
 
        self.build_tree_contents([('other/file', "c\na\nb\n")])
 
615
        self.build_tree_contents([('other/file', b"c\na\nb\n")])
616
616
        other_tree.commit('rev3b')
617
617
        self.run_bzr('merge --weave -d this other -r -2..-1')
618
 
        self.assertFileEqual('c\na\n', 'this/file')
 
618
        self.assertFileEqual(b'c\na\n', 'this/file')
619
619
 
620
620
    def test_lca_merge_criss_cross(self):
621
621
        tree_a = self.make_branch_and_tree('a')
622
 
        self.build_tree_contents([('a/file', 'base-contents\n')])
 
622
        self.build_tree_contents([('a/file', b'base-contents\n')])
623
623
        tree_a.add('file')
624
 
        tree_a.commit('', rev_id='rev1')
 
624
        tree_a.commit('', rev_id=b'rev1')
625
625
        tree_b = tree_a.controldir.sprout('b').open_workingtree()
626
626
        self.build_tree_contents([('a/file',
627
 
                                   'base-contents\nthis-contents\n')])
628
 
        tree_a.commit('', rev_id='rev2a')
 
627
                                   b'base-contents\nthis-contents\n')])
 
628
        tree_a.commit('', rev_id=b'rev2a')
629
629
        self.build_tree_contents([('b/file',
630
 
                                   'base-contents\nother-contents\n')])
631
 
        tree_b.commit('', rev_id='rev2b')
 
630
                                   b'base-contents\nother-contents\n')])
 
631
        tree_b.commit('', rev_id=b'rev2b')
632
632
        tree_a.merge_from_branch(tree_b.branch)
633
633
        self.build_tree_contents([('a/file',
634
 
                                   'base-contents\nthis-contents\n')])
 
634
                                   b'base-contents\nthis-contents\n')])
635
635
        tree_a.set_conflicts(conflicts.ConflictList())
636
636
        tree_b.merge_from_branch(tree_a.branch)
637
637
        self.build_tree_contents([('b/file',
638
 
                                   'base-contents\nother-contents\n')])
 
638
                                   b'base-contents\nother-contents\n')])
639
639
        tree_b.set_conflicts(conflicts.ConflictList())
640
 
        tree_a.commit('', rev_id='rev3a')
641
 
        tree_b.commit('', rev_id='rev3b')
 
640
        tree_a.commit('', rev_id=b'rev3a')
 
641
        tree_b.commit('', rev_id=b'rev3b')
642
642
        out, err = self.run_bzr(['merge', '-d', 'a', 'b', '--lca'], retcode=1)
643
 
        self.assertFileEqual('base-contents\n<<<<<<< TREE\nthis-contents\n'
644
 
                             '=======\nother-contents\n>>>>>>> MERGE-SOURCE\n',
 
643
        self.assertFileEqual(b'base-contents\n<<<<<<< TREE\nthis-contents\n'
 
644
                             b'=======\nother-contents\n>>>>>>> MERGE-SOURCE\n',
645
645
                             'a/file')
646
646
 
647
647
    def test_merge_preview(self):
648
648
        this_tree = self.make_branch_and_tree('this')
649
649
        this_tree.commit('rev1')
650
650
        other_tree = this_tree.controldir.sprout('other').open_workingtree()
651
 
        self.build_tree_contents([('other/file', 'new line')])
 
651
        self.build_tree_contents([('other/file', b'new line')])
652
652
        other_tree.add('file')
653
653
        other_tree.commit('rev2a')
654
654
        this_tree.commit('rev2b')
655
655
        out, err = self.run_bzr(['merge', '-d', 'this', 'other', '--preview'])
656
 
        self.assertContainsRe(out, '\+new line')
657
 
        self.assertNotContainsRe(err, '\+N  file\n')
 
656
        self.assertContainsRe(out, '\\+new line')
 
657
        self.assertNotContainsRe(err, '\\+N  file\n')
658
658
        this_tree.lock_read()
659
659
        self.addCleanup(this_tree.unlock)
660
660
        self.assertEqual([],
686
686
        """
687
687
        # Make a source, sprout a target off it
688
688
        builder = self.make_branch_builder('source')
689
 
        builder.build_commit(message="Rev 1", rev_id='rev-1')
 
689
        builder.build_commit(message="Rev 1", rev_id=b'rev-1')
690
690
        source = builder.get_branch()
691
691
        target_bzrdir = source.controldir.sprout('target')
692
692
        # Add a non-ancestry tag to source
693
 
        builder.build_commit(message="Rev 2a", rev_id='rev-2a')
694
 
        source.tags.set_tag('tag-a', 'rev-2a')
695
 
        source.set_last_revision_info(1, 'rev-1')
 
693
        builder.build_commit(message="Rev 2a", rev_id=b'rev-2a')
 
694
        source.tags.set_tag('tag-a', b'rev-2a')
 
695
        source.set_last_revision_info(1, b'rev-1')
696
696
        source.get_config_stack().set('branch.fetch_tags', True)
697
 
        builder.build_commit(message="Rev 2b", rev_id='rev-2b')
 
697
        builder.build_commit(message="Rev 2b", rev_id=b'rev-2b')
698
698
        # Merge from source
699
699
        self.run_bzr('merge -d target source')
700
700
        target = target_bzrdir.open_branch()
701
701
        # The tag is present, and so is its revision.
702
 
        self.assertEqual('rev-2a', target.tags.lookup_tag('tag-a'))
703
 
        target.repository.get_revision('rev-2a')
 
702
        self.assertEqual(b'rev-2a', target.tags.lookup_tag('tag-a'))
 
703
        target.repository.get_revision(b'rev-2a')
704
704
 
705
705
 
706
706
class TestMergeRevisionRange(tests.TestCaseWithTransport):
728
728
        source = self.make_branch_and_tree('source')
729
729
        self.build_tree(['source/a'])
730
730
        source.add('a')
731
 
        source.commit('Added a', rev_id='rev1')
 
731
        source.commit('Added a', rev_id=b'rev1')
732
732
        target = self.make_branch_and_tree('target')
733
733
        self.run_script("""\
734
734
$ brz merge -d target source
735
735
2>brz: ERROR: Merging into empty branches not currently supported, https://bugs.launchpad.net/bzr/+bug/308562
736
736
""")
737
737
 
 
738
 
738
739
class TestMergeForce(tests.TestCaseWithTransport):
739
740
 
740
741
    def setUp(self):
744
745
        self.tree_a.add(['foo'])
745
746
        self.tree_a.commit('add file')
746
747
        self.tree_b = self.tree_a.controldir.sprout('b').open_workingtree()
747
 
        self.build_tree_contents([('a/foo', 'change 1')])
 
748
        self.build_tree_contents([('a/foo', b'change 1')])
748
749
        self.tree_a.commit('change file')
749
750
        self.tree_b.merge_from_branch(self.tree_a.branch)
750
751
 
753
754
        # Second merge on top of the uncommitted one
754
755
        self.run_bzr(['merge', '../a', '--force'], working_dir='b')
755
756
 
756
 
 
757
757
    def test_merge_with_uncommitted_changes(self):
758
758
        self.run_bzr_error(['Working tree .* has uncommitted changes'],
759
759
                           ['merge', '../a'], working_dir='b')