/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: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_merge.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2012, 2016 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
16
16
#
17
17
# Author: Aaron Bentley <aaron.bentley@utoronto.ca>
18
18
 
19
 
"""Black-box tests for bzr merge.
 
19
"""Black-box tests for brz merge.
20
20
"""
21
21
 
 
22
import doctest
22
23
import os
23
24
 
24
 
from bzrlib import (
 
25
from testtools import matchers
 
26
 
 
27
from breezy import (
25
28
    branch,
26
 
    bzrdir,
27
29
    conflicts,
28
 
    errors,
 
30
    controldir,
29
31
    merge_directive,
30
32
    osutils,
31
33
    tests,
32
34
    urlutils,
33
35
    workingtree,
34
36
    )
 
37
from breezy.tests import (
 
38
    scenarios,
 
39
    script,
 
40
    )
 
41
 
 
42
 
 
43
load_tests = scenarios.load_tests_apply_scenarios
35
44
 
36
45
 
37
46
class TestMerge(tests.TestCaseWithTransport):
39
48
    def example_branch(self, path='.'):
40
49
        tree = self.make_branch_and_tree(path)
41
50
        self.build_tree_contents([
42
 
            (osutils.pathjoin(path, 'hello'), 'foo'),
43
 
            (osutils.pathjoin(path, 'goodbye'), 'baz')])
 
51
            (osutils.pathjoin(path, 'hello'), b'foo'),
 
52
            (osutils.pathjoin(path, 'goodbye'), b'baz')])
44
53
        tree.add('hello')
45
54
        tree.commit(message='setup')
46
55
        tree.add('goodbye')
54
63
            conflict.
55
64
        """
56
65
        builder = self.make_branch_builder('branch')
57
 
        builder.build_snapshot('rev1', None,
58
 
            [('add', ('', 'root-id', 'directory', None)),
59
 
             ('add', ('fname', 'f-id', 'file', 'a\nb\nc\n'))])
60
 
        builder.build_snapshot('rev2other', ['rev1'],
61
 
            [('modify', ('f-id', 'a\nB\nD\n'))])
62
 
        other = builder.get_branch().bzrdir.sprout('other').open_branch()
63
 
        builder.build_snapshot('rev2this', ['rev1'],
64
 
            [('modify', ('f-id', 'a\nB\nC\n'))])
 
66
        builder.build_snapshot(None,
 
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
        other = builder.get_branch().controldir.sprout('other').open_branch()
 
74
        builder.build_snapshot([b'rev1'],
 
75
            [('modify', ('fname', b'a\nB\nC\n'))], revision_id=b'rev2this')
65
76
        tree = builder.get_branch().create_checkout('tree', lightweight=True)
66
77
        return tree, other
67
78
 
68
79
    def test_merge_reprocess(self):
69
 
        d = bzrdir.BzrDir.create_standalone_workingtree('.')
 
80
        d = controldir.ControlDir.create_standalone_workingtree('.')
70
81
        d.commit('h')
71
82
        self.run_bzr('merge . --reprocess --merge-type weave')
72
83
 
73
84
    def test_merge(self):
74
85
        a_tree = self.example_branch('a')
75
86
        ancestor = a_tree.branch.revno()
76
 
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
77
 
        self.build_tree_contents([('b/goodbye', 'quux')])
 
87
        b_tree = a_tree.controldir.sprout('b').open_workingtree()
 
88
        self.build_tree_contents([('b/goodbye', b'quux')])
78
89
        b_tree.commit(message="more u's are always good")
79
90
 
80
 
        self.build_tree_contents([('a/hello', 'quuux')])
 
91
        self.build_tree_contents([('a/hello', b'quuux')])
81
92
        # We can't merge when there are in-tree changes
82
 
        os.chdir('a')
83
 
        self.run_bzr('merge ../b', retcode=3)
84
 
        a = workingtree.WorkingTree.open('.')
 
93
        self.run_bzr('merge ../b', retcode=3, working_dir='a')
 
94
        a = workingtree.WorkingTree.open('a')
85
95
        a_tip = a.commit("Like an epidemic of u's")
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)
94
 
        self.run_bzr_error(['Show-base is not supported for this merge type'],
 
96
 
 
97
        def run_merge_then_revert(args, retcode=None, working_dir='a'):
 
98
            self.run_bzr(['merge', '../b', '-r', 'last:1..last:1'] + args,
 
99
                         retcode=retcode, working_dir=working_dir)
 
100
            if retcode != 3:
 
101
                a_tree.revert(backups=False)
 
102
 
 
103
        run_merge_then_revert(['--merge-type', 'bloof'], retcode=3)
 
104
        run_merge_then_revert(['--merge-type', 'merge3'])
 
105
        run_merge_then_revert(['--merge-type', 'weave'])
 
106
        run_merge_then_revert(['--merge-type', 'lca'])
 
107
        self.run_bzr_error([b'Show-base is not supported for this merge type'],
95
108
                           'merge ../b -r last:1..last:1 --merge-type weave'
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')
 
109
                           ' --show-base', working_dir='a')
 
110
        a_tree.revert(backups=False)
 
111
        self.run_bzr('merge ../b -r last:1..last:1 --reprocess',
 
112
                     working_dir='a')
 
113
        a_tree.revert(backups=False)
 
114
        self.run_bzr('merge ../b -r last:1', working_dir='a')
 
115
        self.check_file_contents('a/goodbye', b'quux')
102
116
        # Merging a branch pulls its revision into the tree
103
 
        b = branch.Branch.open('../b')
 
117
        b = branch.Branch.open('b')
104
118
        b_tip = b.last_revision()
105
 
        self.failUnless(a.branch.repository.has_revision(b_tip))
 
119
        self.assertTrue(a.branch.repository.has_revision(b_tip))
106
120
        self.assertEqual([a_tip, b_tip], a.get_parent_ids())
107
121
        a_tree.revert(backups=False)
108
 
        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3)
 
122
        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3,
 
123
                                working_dir='a')
109
124
        self.assertTrue("Not a branch" in err)
110
125
        self.run_bzr('merge -r revno:%d:./..revno:%d:../b'
111
 
                    %(ancestor,b.revno()))
112
 
        self.assertEquals(a.get_parent_ids(),
 
126
                    %(ancestor, b.revno()), working_dir='a')
 
127
        self.assertEqual(a.get_parent_ids(),
113
128
                          [a.branch.last_revision(), b.last_revision()])
114
 
        self.check_file_contents('goodbye', 'quux')
 
129
        self.check_file_contents('a/goodbye', b'quux')
115
130
        a_tree.revert(backups=False)
116
 
        self.run_bzr('merge -r revno:%d:../b'%b.revno())
117
 
        self.assertEquals(a.get_parent_ids(),
 
131
        self.run_bzr('merge -r revno:%d:../b'%b.revno(), working_dir='a')
 
132
        self.assertEqual(a.get_parent_ids(),
118
133
                          [a.branch.last_revision(), b.last_revision()])
119
134
        a_tip = a.commit('merged')
120
 
        self.run_bzr('merge ../b -r last:1')
 
135
        self.run_bzr('merge ../b -r last:1', working_dir='a')
121
136
        self.assertEqual([a_tip], a.get_parent_ids())
122
137
 
123
138
    def test_merge_defaults_to_reprocess(self):
126
141
        # 'show-base' is not set
127
142
        self.run_bzr('merge ../other', working_dir='tree',
128
143
                     retcode=1)
129
 
        self.assertEqualDiff('a\n'
130
 
                             'B\n'
131
 
                             '<<<<<<< TREE\n'
132
 
                             'C\n'
133
 
                             '=======\n'
134
 
                             'D\n'
135
 
                             '>>>>>>> MERGE-SOURCE\n',
136
 
                             tree.get_file_text('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'))
137
152
 
138
153
    def test_merge_explicit_reprocess_show_base(self):
139
154
        tree, other = self.create_conflicting_branches()
140
155
        # Explicitly setting --reprocess, and --show-base is an error
141
 
        self.run_bzr_error(['Cannot do conflict reduction and show base'],
 
156
        self.run_bzr_error([b'Cannot do conflict reduction and show base'],
142
157
                           'merge ../other --reprocess --show-base',
143
158
                           working_dir='tree')
144
159
 
147
162
        # Explicitly disable reprocess
148
163
        self.run_bzr('merge ../other --no-reprocess', working_dir='tree',
149
164
                     retcode=1)
150
 
        self.assertEqualDiff('a\n'
151
 
                             '<<<<<<< TREE\n'
152
 
                             'B\n'
153
 
                             'C\n'
154
 
                             '=======\n'
155
 
                             'B\n'
156
 
                             'D\n'
157
 
                             '>>>>>>> MERGE-SOURCE\n',
158
 
                             tree.get_file_text('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'))
159
174
 
160
175
    def test_merge_override_show_base(self):
161
176
        tree, other = self.create_conflicting_branches()
162
177
        # Setting '--show-base' will auto-disable '--reprocess'
163
178
        self.run_bzr('merge ../other --show-base', working_dir='tree',
164
179
                     retcode=1)
165
 
        self.assertEqualDiff('a\n'
166
 
                             '<<<<<<< TREE\n'
167
 
                             'B\n'
168
 
                             'C\n'
169
 
                             '||||||| BASE-REVISION\n'
170
 
                             'b\n'
171
 
                             'c\n'
172
 
                             '=======\n'
173
 
                             'B\n'
174
 
                             'D\n'
175
 
                             '>>>>>>> MERGE-SOURCE\n',
176
 
                             tree.get_file_text('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'))
177
192
 
178
193
    def test_merge_with_missing_file(self):
179
194
        """Merge handles missing file conflicts"""
180
195
        self.build_tree_contents([
181
196
            ('a/',),
182
197
            ('a/sub/',),
183
 
            ('a/sub/a.txt', 'hello\n'),
184
 
            ('a/b.txt', 'hello\n'),
185
 
            ('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')])
186
201
        a_tree = self.make_branch_and_tree('a')
187
202
        a_tree.add(['sub', 'b.txt', 'sub/c.txt', 'sub/a.txt'])
188
203
        a_tree.commit(message='added a')
189
 
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
 
204
        b_tree = a_tree.controldir.sprout('b').open_workingtree()
190
205
        self.build_tree_contents([
191
 
            ('a/sub/a.txt', 'hello\nthere\n'),
192
 
            ('a/b.txt', 'hello\nthere\n'),
193
 
            ('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')])
194
209
        a_tree.commit(message='Added there')
195
210
        os.remove('a/sub/a.txt')
196
211
        os.remove('a/sub/c.txt')
198
213
        os.remove('a/b.txt')
199
214
        a_tree.commit(message='Removed a.txt')
200
215
        self.build_tree_contents([
201
 
            ('b/sub/a.txt', 'hello\nsomething\n'),
202
 
            ('b/b.txt', 'hello\nsomething\n'),
203
 
            ('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')])
204
219
        b_tree.commit(message='Modified a.txt')
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')
 
220
 
 
221
        self.run_bzr('merge ../a/', retcode=1, working_dir='b')
 
222
        self.assertPathExists('b/sub/a.txt.THIS')
 
223
        self.assertPathExists('b/sub/a.txt.BASE')
 
224
 
 
225
        self.run_bzr('merge ../b/', retcode=1, working_dir='a')
 
226
        self.assertPathExists('a/sub/a.txt.OTHER')
 
227
        self.assertPathExists('a/sub/a.txt.BASE')
213
228
 
214
229
    def test_conflict_leaves_base_this_other_files(self):
215
230
        tree, other = self.create_conflicting_branches()
234
249
        self.build_tree(['branch_a/a'])
235
250
        tree_a.add('a')
236
251
        tree_a.commit('commit a')
237
 
        branch_b = branch_a.bzrdir.sprout('branch_b').open_branch()
238
 
        tree_b = branch_b.bzrdir.open_workingtree()
239
 
        branch_c = branch_a.bzrdir.sprout('branch_c').open_branch()
240
 
        tree_c = branch_c.bzrdir.open_workingtree()
 
252
        branch_b = branch_a.controldir.sprout('branch_b').open_branch()
 
253
        tree_b = branch_b.controldir.open_workingtree()
 
254
        branch_c = branch_a.controldir.sprout('branch_c').open_branch()
 
255
        tree_c = branch_c.controldir.open_workingtree()
241
256
        self.build_tree(['branch_a/b'])
242
257
        tree_a.add('b')
243
258
        tree_a.commit('commit b')
249
264
        branch_b.set_parent(None)
250
265
        self.assertEqual(None, branch_b.get_parent())
251
266
        # test merge for failure without parent set
252
 
        os.chdir('branch_b')
253
 
        out = self.run_bzr('merge', retcode=3)
254
 
        self.assertEquals(out,
255
 
                ('','bzr: ERROR: No location specified or remembered\n'))
 
267
        out = self.run_bzr('merge', retcode=3, working_dir='branch_b')
 
268
        self.assertEqual(out,
 
269
                (b'', b'brz: ERROR: No location specified or remembered\n'))
256
270
 
257
271
        # test uncommitted changes
258
 
        self.build_tree(['d'])
 
272
        self.build_tree(['branch_b/d'])
259
273
        tree_b.add('d')
260
 
        self.run_bzr_error(['Working tree ".*" has uncommitted changes'],
261
 
                           'merge')
 
274
        self.run_bzr_error([b'Working tree ".*" has uncommitted changes'],
 
275
                           'merge', working_dir='branch_b')
262
276
 
263
277
        # merge should now pass and implicitly remember merge location
264
278
        tree_b.commit('commit d')
265
 
        out, err = self.run_bzr('merge ../branch_a')
 
279
        out, err = self.run_bzr('merge ../branch_a', working_dir='branch_b')
266
280
 
267
281
        base = urlutils.local_path_from_url(branch_a.base)
268
 
        self.assertEndsWith(err, '+N  b\nAll changes applied successfully.\n')
269
 
        self.assertEquals(osutils.abspath(branch_b.get_submit_branch()),
 
282
        self.assertEndsWith(err, b'+N  b\nAll changes applied successfully.\n')
 
283
        # re-open branch as external run_brz modified it
 
284
        branch_b = branch_b.controldir.open_branch()
 
285
        self.assertEqual(osutils.abspath(branch_b.get_submit_branch()),
270
286
                          osutils.abspath(parent))
271
287
        # test implicit --remember when committing new file
272
 
        self.build_tree(['e'])
 
288
        self.build_tree(['branch_b/e'])
273
289
        tree_b.add('e')
274
290
        tree_b.commit('commit e')
275
 
        out, err = self.run_bzr('merge')
276
 
        self.assertStartsWith(err,
277
 
                          'Merging from remembered submit location %s\n' % (base,))
278
 
        # re-open tree as external run_bzr modified it
279
 
        tree_b = branch_b.bzrdir.open_workingtree()
 
291
        out, err = self.run_bzr('merge', working_dir='branch_b')
 
292
        self.assertStartsWith(
 
293
            err, b'Merging from remembered submit location %s\n' % (base,))
 
294
        # re-open tree as external run_brz modified it
 
295
        tree_b = branch_b.controldir.open_workingtree()
280
296
        tree_b.commit('merge branch_a')
281
297
        # test explicit --remember
282
 
        out, err = self.run_bzr('merge ../branch_c --remember')
283
 
        self.assertEquals(out, '')
284
 
        self.assertEquals(err, '+N  c\nAll changes applied successfully.\n')
285
 
        self.assertEquals(osutils.abspath(branch_b.get_submit_branch()),
286
 
                          osutils.abspath(branch_c.bzrdir.root_transport.base))
287
 
        # re-open tree as external run_bzr modified it
288
 
        tree_b = branch_b.bzrdir.open_workingtree()
 
298
        out, err = self.run_bzr('merge ../branch_c --remember',
 
299
                                working_dir='branch_b')
 
300
        self.assertEqual(out, b'')
 
301
        self.assertEqual(err, b'+N  c\nAll changes applied successfully.\n')
 
302
        # re-open branch as external run_brz modified it
 
303
        branch_b = branch_b.controldir.open_branch()
 
304
        self.assertEqual(osutils.abspath(branch_b.get_submit_branch()),
 
305
                          osutils.abspath(branch_c.controldir.root_transport.base))
 
306
        # re-open tree as external run_brz modified it
 
307
        tree_b = branch_b.controldir.open_workingtree()
289
308
        tree_b.commit('merge branch_c')
290
309
 
291
310
    def test_merge_bundle(self):
292
 
        from bzrlib.testament import Testament
 
311
        from breezy.testament import Testament
293
312
        tree_a = self.make_branch_and_tree('branch_a')
294
 
        self.build_tree_contents([('branch_a/a', 'hello')])
 
313
        self.build_tree_contents([('branch_a/a', b'hello')])
295
314
        tree_a.add('a')
296
315
        tree_a.commit('message')
297
316
 
298
 
        tree_b = tree_a.bzrdir.sprout('branch_b').open_workingtree()
299
 
        self.build_tree_contents([('branch_a/a', 'hey there')])
 
317
        tree_b = tree_a.controldir.sprout('branch_b').open_workingtree()
 
318
        self.build_tree_contents([('branch_a/a', b'hey there')])
300
319
        tree_a.commit('message')
301
320
 
302
 
        self.build_tree_contents([('branch_b/a', 'goodbye')])
 
321
        self.build_tree_contents([('branch_b/a', b'goodbye')])
303
322
        tree_b.commit('message')
304
 
        os.chdir('branch_b')
305
 
        self.run_bzr('bundle ../branch_a -o ../bundle')
306
 
        os.chdir('../branch_a')
307
 
        self.run_bzr('merge ../bundle', retcode=1)
 
323
        self.run_bzr('bundle ../branch_a -o ../bundle', working_dir='branch_b')
 
324
        self.run_bzr('merge ../bundle', retcode=1, working_dir='branch_a')
308
325
        testament_a = Testament.from_revision(tree_a.branch.repository,
309
326
                                              tree_b.get_parent_ids()[0])
310
327
        testament_b = Testament.from_revision(tree_b.branch.repository,
314
331
        tree_a.set_conflicts(conflicts.ConflictList())
315
332
        tree_a.commit('message')
316
333
        # it is legal to attempt to merge an already-merged bundle
317
 
        output = self.run_bzr('merge ../bundle')[1]
 
334
        err = self.run_bzr('merge ../bundle', working_dir='branch_a')[1]
318
335
        # but it does nothing
319
336
        self.assertFalse(tree_a.changes_from(tree_a.basis_tree()).has_changed())
320
 
        self.assertEqual('Nothing to do.\n', output)
 
337
        self.assertEqual(b'Nothing to do.\n', err)
321
338
 
322
339
    def test_merge_uncommitted(self):
323
340
        """Check that merge --uncommitted behaves properly"""
325
342
        self.build_tree(['a/file_1', 'a/file_2'])
326
343
        tree_a.add(['file_1', 'file_2'])
327
344
        tree_a.commit('commit 1')
328
 
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
329
 
        self.failUnlessExists('b/file_1')
 
345
        tree_b = tree_a.controldir.sprout('b').open_workingtree()
 
346
        self.assertPathExists('b/file_1')
330
347
        tree_a.rename_one('file_1', 'file_i')
331
348
        tree_a.commit('commit 2')
332
349
        tree_a.rename_one('file_2', 'file_ii')
333
 
        ## os.chdir('b')
334
350
        self.run_bzr('merge a --uncommitted -d b')
335
 
        self.failUnlessExists('b/file_1')
336
 
        self.failUnlessExists('b/file_ii')
 
351
        self.assertPathExists('b/file_1')
 
352
        self.assertPathExists('b/file_ii')
337
353
        tree_b.revert()
338
354
        self.run_bzr_error(('Cannot use --uncommitted and --revision',),
339
355
                           'merge /a --uncommitted -r1 -d b')
342
358
        """It should be possible to merge changes from a single file."""
343
359
        tree_a = self.make_branch_and_tree('tree_a')
344
360
        tree_a.commit('initial commit')
345
 
        tree_a.bzrdir.sprout('tree_b')
 
361
        tree_a.controldir.sprout('tree_b')
346
362
        self.build_tree(['tree_a/file1', 'tree_a/file2'])
347
363
        tree_a.add(['file1', 'file2'])
348
 
        os.chdir('tree_b')
349
 
        self.run_bzr(['merge', '--uncommitted', '../tree_a/file1'])
350
 
        self.failUnlessExists('file1')
351
 
        self.failIfExists('file2')
 
364
        self.run_bzr(['merge', '--uncommitted', '../tree_a/file1'],
 
365
                     working_dir='tree_b')
 
366
        self.assertPathExists('tree_b/file1')
 
367
        self.assertPathDoesNotExist('tree_b/file2')
 
368
 
 
369
    def test_merge_nonexistent_file(self):
 
370
        """It should not be possible to merge changes from a file which
 
371
        does not exist."""
 
372
        tree_a = self.make_branch_and_tree('tree_a')
 
373
        self.build_tree_contents([('tree_a/file', b'bar\n')])
 
374
        tree_a.add(['file'])
 
375
        tree_a.commit('commit 1')
 
376
        self.run_bzr_error(('Path\\(s\\) do not exist: non/existing',),
 
377
                           ['merge', 'non/existing'], working_dir='tree_a')
352
378
 
353
379
    def pullable_branch(self):
354
380
        tree_a = self.make_branch_and_tree('a')
355
 
        self.build_tree(['a/file'])
 
381
        self.build_tree_contents([('a/file', b'bar\n')])
356
382
        tree_a.add(['file'])
357
383
        self.id1 = tree_a.commit('commit 1')
358
384
 
359
385
        tree_b = self.make_branch_and_tree('b')
360
386
        tree_b.pull(tree_a.branch)
361
 
        file('b/file', 'wb').write('foo')
 
387
        self.build_tree_contents([('b/file', b'foo\n')])
362
388
        self.id2 = tree_b.commit('commit 2')
363
389
 
364
390
    def test_merge_pull(self):
365
391
        self.pullable_branch()
366
 
        os.chdir('a')
367
 
        (out, err) = self.run_bzr('merge --pull ../b')
368
 
        self.assertContainsRe(out, 'Now on revision 2\\.')
369
 
        tree_a = workingtree.WorkingTree.open('.')
 
392
        (out, err) = self.run_bzr('merge --pull ../b', working_dir='a')
 
393
        self.assertContainsRe(out, b'Now on revision 2\\.')
 
394
        tree_a = workingtree.WorkingTree.open('a')
370
395
        self.assertEqual([self.id2], tree_a.get_parent_ids())
371
396
 
 
397
    def test_merge_pull_preview(self):
 
398
        self.pullable_branch()
 
399
        (out, err) = self.run_bzr('merge --pull --preview -d a b')
 
400
        self.assertThat(out, matchers.DocTestMatches(
 
401
"""=== modified file 'file'
 
402
--- file\t...
 
403
+++ file\t...
 
404
@@ -1,1 +1,1 @@
 
405
-bar
 
406
+foo
 
407
 
 
408
""", doctest.ELLIPSIS | doctest.REPORT_UDIFF))
 
409
        tree_a = workingtree.WorkingTree.open('a')
 
410
        self.assertEqual([self.id1], tree_a.get_parent_ids())
 
411
 
372
412
    def test_merge_kind_change(self):
373
413
        tree_a = self.make_branch_and_tree('tree_a')
374
 
        self.build_tree_contents([('tree_a/file', 'content_1')])
375
 
        tree_a.add('file', 'file-id')
 
414
        self.build_tree_contents([('tree_a/file', b'content_1')])
 
415
        tree_a.add('file', b'file-id')
376
416
        tree_a.commit('added file')
377
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
417
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
378
418
        os.unlink('tree_a/file')
379
419
        self.build_tree(['tree_a/file/'])
380
420
        tree_a.commit('changed file to directory')
381
 
        os.chdir('tree_b')
382
 
        self.run_bzr('merge ../tree_a')
383
 
        self.assertEqual('directory', osutils.file_kind('file'))
 
421
        self.run_bzr('merge ../tree_a', working_dir='tree_b')
 
422
        self.assertEqual('directory', osutils.file_kind('tree_b/file'))
384
423
        tree_b.revert()
385
 
        self.assertEqual('file', osutils.file_kind('file'))
386
 
        self.build_tree_contents([('file', 'content_2')])
 
424
        self.assertEqual('file', osutils.file_kind('tree_b/file'))
 
425
        self.build_tree_contents([('tree_b/file', b'content_2')])
387
426
        tree_b.commit('content change')
388
 
        self.run_bzr('merge ../tree_a', retcode=1)
 
427
        self.run_bzr('merge ../tree_a', retcode=1, working_dir='tree_b')
389
428
        self.assertEqual(tree_b.conflicts(),
390
429
                         [conflicts.ContentsConflict('file',
391
430
                                                     file_id='file-id')])
393
432
    def test_directive_cherrypick(self):
394
433
        source = self.make_branch_and_tree('source')
395
434
        source.commit("nothing")
396
 
        # see https://bugs.edge.launchpad.net/bzr/+bug/409688 - trying to
 
435
        # see https://bugs.launchpad.net/bzr/+bug/409688 - trying to
397
436
        # cherrypick from one branch into another unrelated branch with a
398
437
        # different root id will give shape conflicts.  as a workaround we
399
438
        # make sure they share the same root id.
400
 
        target = source.bzrdir.sprout('target').open_workingtree()
 
439
        target = source.controldir.sprout('target').open_workingtree()
401
440
        self.build_tree(['source/a'])
402
441
        source.add('a')
403
 
        source.commit('Added a', rev_id='rev1')
 
442
        source.commit('Added a', rev_id=b'rev1')
404
443
        self.build_tree(['source/b'])
405
444
        source.add('b')
406
 
        source.commit('Added b', rev_id='rev2')
 
445
        source.commit('Added b', rev_id=b'rev2')
407
446
        target.commit('empty commit')
408
 
        self.write_directive('directive', source.branch, 'target', 'rev2',
409
 
                             'rev1')
 
447
        self.write_directive('directive', source.branch, 'target', b'rev2',
 
448
                             b'rev1')
410
449
        out, err = self.run_bzr('merge -d target directive')
411
 
        self.failIfExists('target/a')
412
 
        self.failUnlessExists('target/b')
413
 
        self.assertContainsRe(err, 'Performing cherrypick')
 
450
        self.assertPathDoesNotExist('target/a')
 
451
        self.assertPathExists('target/b')
 
452
        self.assertContainsRe(err, b'Performing cherrypick')
414
453
 
415
454
    def write_directive(self, filename, source, target, revision_id,
416
455
                        base_revision_id=None, mangle_patch=False):
419
458
            base_revision_id=base_revision_id)
420
459
        if mangle_patch:
421
460
            md.patch = 'asdf\n'
422
 
        self.build_tree_contents([(filename, ''.join(md.to_lines()))])
 
461
        self.build_tree_contents([(filename, b''.join(md.to_lines()))])
423
462
 
424
463
    def test_directive_verify_warning(self):
425
464
        source = self.make_branch_and_tree('source')
426
465
        self.build_tree(['source/a'])
427
466
        source.add('a')
428
 
        source.commit('Added a', rev_id='rev1')
 
467
        source.commit('Added a', rev_id=b'rev1')
429
468
        target = self.make_branch_and_tree('target')
430
469
        target.commit('empty commit')
431
 
        self.write_directive('directive', source.branch, 'target', 'rev1')
 
470
        self.write_directive('directive', source.branch, 'target', b'rev1')
432
471
        err = self.run_bzr('merge -d target directive')[1]
433
 
        self.assertNotContainsRe(err, 'Preview patch does not match changes')
 
472
        self.assertNotContainsRe(err, b'Preview patch does not match changes')
434
473
        target.revert()
435
 
        self.write_directive('directive', source.branch, 'target', 'rev1',
 
474
        self.write_directive('directive', source.branch, 'target', b'rev1',
436
475
                             mangle_patch=True)
437
476
        err = self.run_bzr('merge -d target directive')[1]
438
 
        self.assertContainsRe(err, 'Preview patch does not match changes')
 
477
        self.assertContainsRe(err, b'Preview patch does not match changes')
439
478
 
440
479
    def test_merge_arbitrary(self):
441
480
        target = self.make_branch_and_tree('target')
442
481
        target.commit('empty')
443
482
        # We need a revision that has no integer revno
444
 
        branch_a = target.bzrdir.sprout('branch_a').open_workingtree()
 
483
        branch_a = target.controldir.sprout('branch_a').open_workingtree()
445
484
        self.build_tree(['branch_a/file1'])
446
485
        branch_a.add('file1')
447
 
        branch_a.commit('added file1', rev_id='rev2a')
448
 
        branch_b = target.bzrdir.sprout('branch_b').open_workingtree()
 
486
        branch_a.commit('added file1', rev_id=b'rev2a')
 
487
        branch_b = target.controldir.sprout('branch_b').open_workingtree()
449
488
        self.build_tree(['branch_b/file2'])
450
489
        branch_b.add('file2')
451
 
        branch_b.commit('added file2', rev_id='rev2b')
 
490
        branch_b.commit('added file2', rev_id=b'rev2b')
452
491
        branch_b.merge_from_branch(branch_a.branch)
453
 
        self.failUnlessExists('branch_b/file1')
454
 
        branch_b.commit('merged branch_a', rev_id='rev3b')
 
492
        self.assertPathExists('branch_b/file1')
 
493
        branch_b.commit('merged branch_a', rev_id=b'rev3b')
455
494
 
456
495
        # It works if the revid has an interger revno
457
496
        self.run_bzr('merge -d target -r revid:rev2a branch_a')
458
 
        self.failUnlessExists('target/file1')
459
 
        self.failIfExists('target/file2')
 
497
        self.assertPathExists('target/file1')
 
498
        self.assertPathDoesNotExist('target/file2')
460
499
        target.revert()
461
500
 
462
501
        # It should work if the revid has no integer revno
463
502
        self.run_bzr('merge -d target -r revid:rev2a branch_b')
464
 
        self.failUnlessExists('target/file1')
465
 
        self.failIfExists('target/file2')
 
503
        self.assertPathExists('target/file1')
 
504
        self.assertPathDoesNotExist('target/file2')
466
505
 
467
506
    def assertDirectoryContent(self, directory, entries, message=''):
468
507
        """Assert whether entries (file or directories) exist in a directory.
484
523
        for f in ('a', 'b', 'c', 'd'):
485
524
            self.build_tree(['source/'+f])
486
525
            source.add(f)
487
 
            source.commit('added '+f, rev_id='rev_'+f)
 
526
            source.commit('added '+f, rev_id=b'rev_'+f)
488
527
        # target branch
489
 
        target = source.bzrdir.sprout('target', 'rev_a').open_workingtree()
 
528
        target = source.controldir.sprout('target', b'rev_a').open_workingtree()
490
529
        self.assertDirectoryContent('target', ['.bzr', 'a'])
491
530
        # pick 1 revision
492
531
        self.run_bzr('merge -d target -r revid:rev_b..revid:rev_c source')
502
541
 
503
542
    def test_merge_criss_cross(self):
504
543
        tree_a = self.make_branch_and_tree('a')
505
 
        tree_a.commit('', rev_id='rev1')
506
 
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
507
 
        tree_a.commit('', rev_id='rev2a')
508
 
        tree_b.commit('', rev_id='rev2b')
 
544
        tree_a.commit('', rev_id=b'rev1')
 
545
        tree_b = tree_a.controldir.sprout('b').open_workingtree()
 
546
        tree_a.commit('', rev_id=b'rev2a')
 
547
        tree_b.commit('', rev_id=b'rev2b')
509
548
        tree_a.merge_from_branch(tree_b.branch)
510
549
        tree_b.merge_from_branch(tree_a.branch)
511
 
        tree_a.commit('', rev_id='rev3a')
512
 
        tree_b.commit('', rev_id='rev3b')
 
550
        tree_a.commit('', rev_id=b'rev3a')
 
551
        tree_b.commit('', rev_id=b'rev3b')
513
552
        graph = tree_a.branch.repository.get_graph(tree_b.branch.repository)
514
553
        out, err = self.run_bzr(['merge', '-d', 'a', 'b'])
515
 
        self.assertContainsRe(err, 'Warning: criss-cross merge encountered.')
 
554
        self.assertContainsRe(err, b'Warning: criss-cross merge encountered.')
516
555
 
517
556
    def test_merge_from_submit(self):
518
557
        tree_a = self.make_branch_and_tree('a')
519
 
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
520
 
        tree_c = tree_a.bzrdir.sprout('c').open_workingtree()
521
 
        out, err = self.run_bzr(['merge', '-d', 'c'])
522
 
        self.assertContainsRe(err, 'Merging from remembered parent location .*a\/')
523
 
        tree_c.branch.set_submit_branch(tree_b.bzrdir.root_transport.base)
524
 
        out, err = self.run_bzr(['merge', '-d', 'c'])
525
 
        self.assertContainsRe(err, 'Merging from remembered submit location .*b\/')
 
558
        tree_a.commit('test')
 
559
        tree_b = tree_a.controldir.sprout('b').open_workingtree()
 
560
        tree_c = tree_a.controldir.sprout('c').open_workingtree()
 
561
        out, err = self.run_bzr(['merge', '-d', 'c'])
 
562
        self.assertContainsRe(err,
 
563
                              b'Merging from remembered parent location .*a\\/')
 
564
        with tree_c.branch.lock_write():
 
565
            tree_c.branch.set_submit_branch(tree_b.controldir.root_transport.base)
 
566
        out, err = self.run_bzr(['merge', '-d', 'c'])
 
567
        self.assertContainsRe(err,
 
568
                              b'Merging from remembered submit location .*b\\/')
526
569
 
527
570
    def test_remember_sets_submit(self):
528
571
        tree_a = self.make_branch_and_tree('a')
529
 
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
 
572
        tree_a.commit('rev1')
 
573
        tree_b = tree_a.controldir.sprout('b').open_workingtree()
530
574
        self.assertIs(tree_b.branch.get_submit_branch(), None)
531
575
 
532
576
        # Remember should not happen if using default from parent
533
577
        out, err = self.run_bzr(['merge', '-d', 'b'])
534
 
        self.assertIs(tree_b.branch.get_submit_branch(), None)
 
578
        refreshed = workingtree.WorkingTree.open('b')
 
579
        self.assertIs(refreshed.branch.get_submit_branch(), None)
535
580
 
536
581
        # Remember should happen if user supplies location
537
582
        out, err = self.run_bzr(['merge', '-d', 'b', 'a'])
538
 
        self.assertEqual(tree_b.branch.get_submit_branch(),
539
 
                         tree_a.bzrdir.root_transport.base)
 
583
        refreshed = workingtree.WorkingTree.open('b')
 
584
        self.assertEqual(refreshed.branch.get_submit_branch(),
 
585
                         tree_a.controldir.root_transport.base)
 
586
 
 
587
    def test_no_remember_dont_set_submit(self):
 
588
        tree_a = self.make_branch_and_tree('a')
 
589
        self.build_tree_contents([('a/file', b"a\n")])
 
590
        tree_a.add('file')
 
591
        tree_a.commit('rev1')
 
592
        tree_b = tree_a.controldir.sprout('b').open_workingtree()
 
593
        self.assertIs(tree_b.branch.get_submit_branch(), None)
 
594
 
 
595
        # Remember should not happen if using default from parent
 
596
        out, err = self.run_bzr(['merge', '-d', 'b', '--no-remember'])
 
597
        self.assertEqual(None, tree_b.branch.get_submit_branch())
 
598
 
 
599
        # Remember should not happen if user supplies location but ask for not
 
600
        # remembering it
 
601
        out, err = self.run_bzr(['merge', '-d', 'b', '--no-remember', 'a'])
 
602
        self.assertEqual(None, tree_b.branch.get_submit_branch())
540
603
 
541
604
    def test_weave_cherrypick(self):
542
605
        this_tree = self.make_branch_and_tree('this')
543
 
        self.build_tree_contents([('this/file', "a\n")])
 
606
        self.build_tree_contents([('this/file', b"a\n")])
544
607
        this_tree.add('file')
545
608
        this_tree.commit('rev1')
546
 
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
547
 
        self.build_tree_contents([('other/file', "a\nb\n")])
 
609
        other_tree = this_tree.controldir.sprout('other').open_workingtree()
 
610
        self.build_tree_contents([('other/file', b"a\nb\n")])
548
611
        other_tree.commit('rev2b')
549
 
        self.build_tree_contents([('other/file', "c\na\nb\n")])
 
612
        self.build_tree_contents([('other/file', b"c\na\nb\n")])
550
613
        other_tree.commit('rev3b')
551
614
        self.run_bzr('merge --weave -d this other -r -2..-1')
552
615
        self.assertFileEqual('c\na\n', 'this/file')
553
616
 
554
617
    def test_lca_merge_criss_cross(self):
555
618
        tree_a = self.make_branch_and_tree('a')
556
 
        self.build_tree_contents([('a/file', 'base-contents\n')])
 
619
        self.build_tree_contents([('a/file', b'base-contents\n')])
557
620
        tree_a.add('file')
558
 
        tree_a.commit('', rev_id='rev1')
559
 
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
 
621
        tree_a.commit('', rev_id=b'rev1')
 
622
        tree_b = tree_a.controldir.sprout('b').open_workingtree()
560
623
        self.build_tree_contents([('a/file',
561
 
                                   'base-contents\nthis-contents\n')])
562
 
        tree_a.commit('', rev_id='rev2a')
 
624
                                   b'base-contents\nthis-contents\n')])
 
625
        tree_a.commit('', rev_id=b'rev2a')
563
626
        self.build_tree_contents([('b/file',
564
 
                                   'base-contents\nother-contents\n')])
565
 
        tree_b.commit('', rev_id='rev2b')
 
627
                                   b'base-contents\nother-contents\n')])
 
628
        tree_b.commit('', rev_id=b'rev2b')
566
629
        tree_a.merge_from_branch(tree_b.branch)
567
630
        self.build_tree_contents([('a/file',
568
 
                                   'base-contents\nthis-contents\n')])
 
631
                                   b'base-contents\nthis-contents\n')])
569
632
        tree_a.set_conflicts(conflicts.ConflictList())
570
633
        tree_b.merge_from_branch(tree_a.branch)
571
634
        self.build_tree_contents([('b/file',
572
 
                                   'base-contents\nother-contents\n')])
 
635
                                   b'base-contents\nother-contents\n')])
573
636
        tree_b.set_conflicts(conflicts.ConflictList())
574
 
        tree_a.commit('', rev_id='rev3a')
575
 
        tree_b.commit('', rev_id='rev3b')
 
637
        tree_a.commit('', rev_id=b'rev3a')
 
638
        tree_b.commit('', rev_id=b'rev3b')
576
639
        out, err = self.run_bzr(['merge', '-d', 'a', 'b', '--lca'], retcode=1)
577
640
        self.assertFileEqual('base-contents\n<<<<<<< TREE\nthis-contents\n'
578
641
                             '=======\nother-contents\n>>>>>>> MERGE-SOURCE\n',
581
644
    def test_merge_preview(self):
582
645
        this_tree = self.make_branch_and_tree('this')
583
646
        this_tree.commit('rev1')
584
 
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
585
 
        self.build_tree_contents([('other/file', 'new line')])
 
647
        other_tree = this_tree.controldir.sprout('other').open_workingtree()
 
648
        self.build_tree_contents([('other/file', b'new line')])
586
649
        other_tree.add('file')
587
650
        other_tree.commit('rev2a')
588
651
        this_tree.commit('rev2b')
589
652
        out, err = self.run_bzr(['merge', '-d', 'this', 'other', '--preview'])
590
 
        self.assertContainsRe(out, '\+new line')
591
 
        self.assertNotContainsRe(err, '\+N  file\n')
 
653
        self.assertContainsRe(out, b'\\+new line')
 
654
        self.assertNotContainsRe(err, b'\\+N  file\n')
592
655
        this_tree.lock_read()
593
656
        self.addCleanup(this_tree.unlock)
594
657
        self.assertEqual([],
603
666
        other.add('other_file')
604
667
        other.commit('rev1b')
605
668
        self.run_bzr('merge -d this other -r0..')
606
 
        self.failUnlessExists('this/other_file')
 
669
        self.assertPathExists('this/other_file')
607
670
 
608
671
    def test_merge_interactive_unlocks_branch(self):
609
672
        this = self.make_branch_and_tree('this')
610
 
        other = self.make_branch_and_tree('other')
611
 
        other.commit('empty commit')
 
673
        this.commit('empty commit')
 
674
        other = this.controldir.sprout('other').open_workingtree()
 
675
        other.commit('empty commit 2')
612
676
        self.run_bzr('merge -i -d this other')
613
677
        this.lock_write()
614
678
        this.unlock()
615
679
 
616
 
    def test_merge_reversed_revision_range(self):
617
 
        tree = self.make_branch_and_tree(".")
 
680
    def test_merge_fetches_tags(self):
 
681
        """Tags are updated by merge, and revisions named in those tags are
 
682
        fetched.
 
683
        """
 
684
        # Make a source, sprout a target off it
 
685
        builder = self.make_branch_builder('source')
 
686
        builder.build_commit(message="Rev 1", rev_id=b'rev-1')
 
687
        source = builder.get_branch()
 
688
        target_bzrdir = source.controldir.sprout('target')
 
689
        # Add a non-ancestry tag to source
 
690
        builder.build_commit(message="Rev 2a", rev_id=b'rev-2a')
 
691
        source.tags.set_tag('tag-a', b'rev-2a')
 
692
        source.set_last_revision_info(1, b'rev-1')
 
693
        source.get_config_stack().set('branch.fetch_tags', True)
 
694
        builder.build_commit(message="Rev 2b", rev_id=b'rev-2b')
 
695
        # Merge from source
 
696
        self.run_bzr('merge -d target source')
 
697
        target = target_bzrdir.open_branch()
 
698
        # The tag is present, and so is its revision.
 
699
        self.assertEqual(b'rev-2a', target.tags.lookup_tag('tag-a'))
 
700
        target.repository.get_revision(b'rev-2a')
 
701
 
 
702
 
 
703
class TestMergeRevisionRange(tests.TestCaseWithTransport):
 
704
 
 
705
    scenarios = (('whole-tree', dict(context='.')),
 
706
                 ('file-only', dict(context='a')))
 
707
 
 
708
    def setUp(self):
 
709
        super(TestMergeRevisionRange, self).setUp()
 
710
        self.tree = self.make_branch_and_tree(".")
 
711
        self.tree.commit('initial commit')
618
712
        for f in ("a", "b"):
619
713
            self.build_tree([f])
620
 
            tree.add(f)
621
 
            tree.commit("added "+f)
622
 
        for context in (".", "", "a"):
623
 
            self.run_bzr("merge -r 1..0 " + context)
624
 
            self.failIfExists("a")
625
 
            tree.revert()
626
 
            self.failUnlessExists("a")
627
 
 
 
714
            self.tree.add(f)
 
715
            self.tree.commit("added " + f)
 
716
 
 
717
    def test_merge_reversed_revision_range(self):
 
718
        self.run_bzr("merge -r 2..1 " + self.context)
 
719
        self.assertPathDoesNotExist("a")
 
720
        self.assertPathExists("b")
 
721
 
 
722
 
 
723
class TestMergeScript(script.TestCaseWithTransportAndScript):
 
724
    def test_merge_empty_branch(self):
 
725
        source = self.make_branch_and_tree('source')
 
726
        self.build_tree(['source/a'])
 
727
        source.add('a')
 
728
        source.commit('Added a', rev_id=b'rev1')
 
729
        target = self.make_branch_and_tree('target')
 
730
        self.run_script("""\
 
731
$ brz merge -d target source
 
732
2>brz: ERROR: Merging into empty branches not currently supported, https://bugs.launchpad.net/bzr/+bug/308562
 
733
""")
628
734
 
629
735
class TestMergeForce(tests.TestCaseWithTransport):
630
736
 
634
740
        self.build_tree(['a/foo'])
635
741
        self.tree_a.add(['foo'])
636
742
        self.tree_a.commit('add file')
637
 
        self.tree_b = self.tree_a.bzrdir.sprout('b').open_workingtree()
638
 
        self.build_tree_contents([('a/foo', 'change 1')])
 
743
        self.tree_b = self.tree_a.controldir.sprout('b').open_workingtree()
 
744
        self.build_tree_contents([('a/foo', b'change 1')])
639
745
        self.tree_a.commit('change file')
640
746
        self.tree_b.merge_from_branch(self.tree_a.branch)
641
747
 
646
752
 
647
753
 
648
754
    def test_merge_with_uncommitted_changes(self):
649
 
        self.run_bzr_error(['Working tree .* has uncommitted changes'],
 
755
        self.run_bzr_error([b'Working tree .* has uncommitted changes'],
650
756
                           ['merge', '../a'], working_dir='b')
651
757
 
652
758
    def test_merge_with_pending_merges(self):
653
759
        # Revert the changes keeping the pending merge
654
760
        self.run_bzr(['revert', 'b'])
655
 
        self.run_bzr_error(['Working tree .* has uncommitted changes'],
 
761
        self.run_bzr_error([b'Working tree .* has uncommitted changes'],
656
762
                           ['merge', '../a'], working_dir='b')