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

  • Committer: Marius Kruger
  • Date: 2010-07-10 21:28:56 UTC
  • mto: (5384.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5385.
  • Revision ID: marius.kruger@enerweb.co.za-20100710212856-uq4ji3go0u5se7hx
* Update documentation
* add NEWS

Show diffs side-by-side

added added

removed removed

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