/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-08-23 01:15:41 UTC
  • mfrom: (7520.1.4 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200823011541-nv0oh7nzaganx2qy
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/389690

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