← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-01-03 18:09:01 UTC
  • mfrom: (3159.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20080103180901-w987y1ftqoh02qbm
(vila) Fix #179368 by keeping the current range hint on
        ShortReadvErrors

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
21
21
 
22
22
import os
23
23
 
 
24
from bzrlib import merge_directive
24
25
from bzrlib.branch import Branch
25
26
from bzrlib.bzrdir import BzrDir
26
27
from bzrlib.conflicts import ConflictList, ContentsConflict
27
 
from bzrlib.osutils import abspath, file_kind
 
28
from bzrlib.osutils import abspath, file_kind, pathjoin
28
29
from bzrlib.tests.blackbox import ExternalBase
29
30
import bzrlib.urlutils as urlutils
30
31
from bzrlib.workingtree import WorkingTree
32
33
 
33
34
class TestMerge(ExternalBase):
34
35
 
35
 
    def example_branch(test):
36
 
        test.runbzr('init')
37
 
        file('hello', 'wt').write('foo')
38
 
        test.runbzr('add hello')
39
 
        test.runbzr('commit -m setup hello')
40
 
        file('goodbye', 'wt').write('baz')
41
 
        test.runbzr('add goodbye')
42
 
        test.runbzr('commit -m setup goodbye')
 
36
    def example_branch(self, path='.'):
 
37
        tree = self.make_branch_and_tree(path)
 
38
        self.build_tree_contents([
 
39
            (pathjoin(path, 'hello'), 'foo'),
 
40
            (pathjoin(path, 'goodbye'), 'baz')])
 
41
        tree.add('hello')
 
42
        tree.commit(message='setup')
 
43
        tree.add('goodbye')
 
44
        tree.commit(message='setup')
 
45
        return tree
43
46
 
44
47
    def test_merge_reprocess(self):
45
48
        d = BzrDir.create_standalone_workingtree('.')
46
49
        d.commit('h')
47
 
        self.run_bzr('merge', '.', '--reprocess', '--merge-type', 'weave')
 
50
        self.run_bzr('merge . --reprocess --merge-type weave')
48
51
 
49
52
    def test_merge(self):
50
53
        from bzrlib.branch import Branch
51
 
        
52
 
        os.mkdir('a')
53
 
        os.chdir('a')
54
 
        self.example_branch()
55
 
        ancestor = Branch.open('.').revno()
56
 
        os.chdir('..')
57
 
        self.runbzr('branch a b')
58
 
        os.chdir('b')
59
 
        file('goodbye', 'wt').write('quux')
60
 
        self.runbzr(['commit',  '-m',  "more u's are always good"])
61
 
 
62
 
        os.chdir('../a')
63
 
        file('hello', 'wt').write('quuux')
 
54
 
 
55
        a_tree = self.example_branch('a')
 
56
        ancestor = a_tree.branch.revno()
 
57
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
 
58
        self.build_tree_contents([('b/goodbye', 'quux')])
 
59
        b_tree.commit(message="more u's are always good")
 
60
 
 
61
        self.build_tree_contents([('a/hello', 'quuux')])
64
62
        # We can't merge when there are in-tree changes
65
 
        self.runbzr('merge ../b', retcode=3)
 
63
        os.chdir('a')
 
64
        self.run_bzr('merge ../b', retcode=3)
66
65
        a = WorkingTree.open('.')
67
66
        a_tip = a.commit("Like an epidemic of u's")
68
 
        self.runbzr('merge ../b -r last:1..last:1 --merge-type blooof',
 
67
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type blooof',
69
68
                    retcode=3)
70
 
        self.runbzr('merge ../b -r last:1..last:1 --merge-type merge3')
71
 
        self.runbzr('revert --no-backup')
72
 
        self.runbzr('merge ../b -r last:1..last:1 --merge-type weave')
73
 
        self.runbzr('revert --no-backup')
74
 
        self.runbzr('merge ../b -r last:1..last:1 --reprocess')
75
 
        self.runbzr('revert --no-backup')
76
 
        self.runbzr('merge ../b -r last:1')
 
69
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type merge3')
 
70
        a_tree.revert(backups=False)
 
71
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type weave')
 
72
        a_tree.revert(backups=False)
 
73
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type lca')
 
74
        a_tree.revert(backups=False)
 
75
        self.run_bzr_error(['Show-base is not supported for this merge type'],
 
76
                           'merge ../b -r last:1..last:1 --merge-type weave'
 
77
                           ' --show-base')
 
78
        a_tree.revert(backups=False)
 
79
        self.run_bzr('merge ../b -r last:1..last:1 --reprocess')
 
80
        a_tree.revert(backups=False)
 
81
        self.run_bzr('merge ../b -r last:1')
77
82
        self.check_file_contents('goodbye', 'quux')
78
83
        # Merging a branch pulls its revision into the tree
79
84
        b = Branch.open('../b')
80
85
        b_tip = b.last_revision()
81
86
        self.failUnless(a.branch.repository.has_revision(b_tip))
82
87
        self.assertEqual([a_tip, b_tip], a.get_parent_ids())
83
 
        self.runbzr('revert --no-backup')
84
 
        out, err = self.runbzr('merge -r revno:1:./hello', retcode=3)
 
88
        a_tree.revert(backups=False)
 
89
        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3)
85
90
        self.assertTrue("Not a branch" in err)
86
 
        self.runbzr('merge -r revno:%d:./..revno:%d:../b'
 
91
        self.run_bzr('merge -r revno:%d:./..revno:%d:../b'
87
92
                    %(ancestor,b.revno()))
88
93
        self.assertEquals(a.get_parent_ids(), 
89
94
                          [a.branch.last_revision(), b.last_revision()])
90
95
        self.check_file_contents('goodbye', 'quux')
91
 
        self.runbzr('revert --no-backup')
92
 
        self.runbzr('merge -r revno:%d:../b'%b.revno())
 
96
        a_tree.revert(backups=False)
 
97
        self.run_bzr('merge -r revno:%d:../b'%b.revno())
93
98
        self.assertEquals(a.get_parent_ids(),
94
99
                          [a.branch.last_revision(), b.last_revision()])
95
100
        a_tip = a.commit('merged')
96
 
        self.runbzr('merge ../b -r last:1')
 
101
        self.run_bzr('merge ../b -r last:1')
97
102
        self.assertEqual([a_tip], a.get_parent_ids())
98
103
 
99
104
    def test_merge_with_missing_file(self):
100
105
        """Merge handles missing file conflicts"""
101
 
        os.mkdir('a')
102
 
        os.chdir('a')
103
 
        os.mkdir('sub')
104
 
        print >> file('sub/a.txt', 'wb'), "hello"
105
 
        print >> file('b.txt', 'wb'), "hello"
106
 
        print >> file('sub/c.txt', 'wb'), "hello"
107
 
        self.runbzr('init')
108
 
        self.runbzr('add')
109
 
        self.runbzr(('commit', '-m', 'added a'))
110
 
        self.runbzr('branch . ../b')
111
 
        print >> file('sub/a.txt', 'ab'), "there"
112
 
        print >> file('b.txt', 'ab'), "there"
113
 
        print >> file('sub/c.txt', 'ab'), "there"
114
 
        self.runbzr(('commit', '-m', 'Added there'))
115
 
        os.unlink('sub/a.txt')
116
 
        os.unlink('sub/c.txt')
117
 
        os.rmdir('sub')
118
 
        os.unlink('b.txt')
119
 
        self.runbzr(('commit', '-m', 'Removed a.txt'))
120
 
        os.chdir('../b')
121
 
        print >> file('sub/a.txt', 'ab'), "something"
122
 
        print >> file('b.txt', 'ab'), "something"
123
 
        print >> file('sub/c.txt', 'ab'), "something"
124
 
        self.runbzr(('commit', '-m', 'Modified a.txt'))
125
 
        self.runbzr('merge ../a/', retcode=1)
126
 
        self.assert_(os.path.exists('sub/a.txt.THIS'))
127
 
        self.assert_(os.path.exists('sub/a.txt.BASE'))
 
106
        self.build_tree_contents([
 
107
            ('a/',),
 
108
            ('a/sub/',),
 
109
            ('a/sub/a.txt', 'hello\n'),
 
110
            ('a/b.txt', 'hello\n'),
 
111
            ('a/sub/c.txt', 'hello\n')])
 
112
        a_tree = self.make_branch_and_tree('a')
 
113
        a_tree.add(['sub', 'b.txt', 'sub/c.txt', 'sub/a.txt'])
 
114
        a_tree.commit(message='added a')
 
115
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
 
116
        self.build_tree_contents([
 
117
            ('a/sub/a.txt', 'hello\nthere\n'),
 
118
            ('a/b.txt', 'hello\nthere\n'),
 
119
            ('a/sub/c.txt', 'hello\nthere\n')])
 
120
        a_tree.commit(message='Added there')
 
121
        os.remove('a/sub/a.txt')
 
122
        os.remove('a/sub/c.txt')
 
123
        os.rmdir('a/sub')
 
124
        os.remove('a/b.txt')
 
125
        a_tree.commit(message='Removed a.txt')
 
126
        self.build_tree_contents([
 
127
            ('b/sub/a.txt', 'hello\nsomething\n'),
 
128
            ('b/b.txt', 'hello\nsomething\n'),
 
129
            ('b/sub/c.txt', 'hello\nsomething\n')])
 
130
        b_tree.commit(message='Modified a.txt')
 
131
        os.chdir('b')
 
132
        self.run_bzr('merge ../a/', retcode=1)
 
133
        self.failUnlessExists('sub/a.txt.THIS')
 
134
        self.failUnlessExists('sub/a.txt.BASE')
128
135
        os.chdir('../a')
129
 
        self.runbzr('merge ../b/', retcode=1)
130
 
        self.assert_(os.path.exists('sub/a.txt.OTHER'))
131
 
        self.assert_(os.path.exists('sub/a.txt.BASE'))
 
136
        self.run_bzr('merge ../b/', retcode=1)
 
137
        self.failUnlessExists('sub/a.txt.OTHER')
 
138
        self.failUnlessExists('sub/a.txt.BASE')
132
139
 
133
140
    def test_merge_remember(self):
134
141
        """Merge changes from one branch to another and test parent location."""
153
160
        self.assertEqual(None, branch_b.get_parent())
154
161
        # test merge for failure without parent set
155
162
        os.chdir('branch_b')
156
 
        out = self.runbzr('merge', retcode=3)
 
163
        out = self.run_bzr('merge', retcode=3)
157
164
        self.assertEquals(out,
158
165
                ('','bzr: ERROR: No location specified or remembered\n'))
159
166
        # test implicit --remember when no parent set, this merge conflicts
160
167
        self.build_tree(['d'])
161
168
        tree_b.add('d')
162
 
        out = self.runbzr('merge ../branch_a', retcode=3)
163
 
        self.assertEquals(out,
164
 
                ('','bzr: ERROR: Working tree has uncommitted changes.\n'))
 
169
        self.run_bzr_error(['Working tree ".*" has uncommitted changes'],
 
170
                           'merge ../branch_a')
165
171
        self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))
166
172
        # test implicit --remember after resolving conflict
167
173
        tree_b.commit('commit d')
168
 
        out, err = self.runbzr('merge')
 
174
        out, err = self.run_bzr('merge')
169
175
        
170
176
        base = urlutils.local_path_from_url(branch_a.base)
171
177
        self.assertEquals(out, 'Merging from remembered location %s\n' % (base,))
172
178
        self.assertEquals(err, '+N  b\nAll changes applied successfully.\n')
173
179
        self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))
174
 
        # re-open tree as external runbzr modified it
 
180
        # re-open tree as external run_bzr modified it
175
181
        tree_b = branch_b.bzrdir.open_workingtree()
176
182
        tree_b.commit('merge branch_a')
177
183
        # test explicit --remember
178
 
        out, err = self.runbzr('merge ../branch_c --remember')
 
184
        out, err = self.run_bzr('merge ../branch_c --remember')
179
185
        self.assertEquals(out, '')
180
186
        self.assertEquals(err, '+N  c\nAll changes applied successfully.\n')
181
187
        self.assertEquals(abspath(branch_b.get_parent()),
182
188
                          abspath(branch_c.bzrdir.root_transport.base))
183
 
        # re-open tree as external runbzr modified it
 
189
        # re-open tree as external run_bzr modified it
184
190
        tree_b = branch_b.bzrdir.open_workingtree()
185
191
        tree_b.commit('merge branch_c')
186
192
 
187
193
    def test_merge_bundle(self):
188
194
        from bzrlib.testament import Testament
189
195
        tree_a = self.make_branch_and_tree('branch_a')
190
 
        f = file('branch_a/a', 'wb')
191
 
        f.write('hello')
192
 
        f.close()
 
196
        self.build_tree_contents([('branch_a/a', 'hello')])
193
197
        tree_a.add('a')
194
198
        tree_a.commit('message')
195
199
 
196
200
        tree_b = tree_a.bzrdir.sprout('branch_b').open_workingtree()
197
 
        f = file('branch_a/a', 'wb')
198
 
        f.write('hey there')
199
 
        f.close()
 
201
        self.build_tree_contents([('branch_a/a', 'hey there')])
200
202
        tree_a.commit('message')
201
203
 
202
 
        f = file('branch_b/a', 'wb')
203
 
        f.write('goodbye')
204
 
        f.close()
 
204
        self.build_tree_contents([('branch_b/a', 'goodbye')])
205
205
        tree_b.commit('message')
206
206
        os.chdir('branch_b')
207
 
        file('../bundle', 'wb').write(self.runbzr('bundle ../branch_a')[0])
 
207
        self.run_bzr('bundle ../branch_a -o ../bundle')
208
208
        os.chdir('../branch_a')
209
 
        self.runbzr('merge ../bundle', retcode=1)
 
209
        self.run_bzr('merge ../bundle', retcode=1)
210
210
        testament_a = Testament.from_revision(tree_a.branch.repository,
211
211
                                              tree_b.get_parent_ids()[0])
212
212
        testament_b = Testament.from_revision(tree_b.branch.repository,
216
216
        tree_a.set_conflicts(ConflictList())
217
217
        tree_a.commit('message')
218
218
        # it is legal to attempt to merge an already-merged bundle
219
 
        output = self.runbzr('merge ../bundle')[1]
 
219
        output = self.run_bzr('merge ../bundle')[1]
220
220
        # but it does nothing
221
221
        self.assertFalse(tree_a.changes_from(tree_a.basis_tree()).has_changed())
222
222
        self.assertEqual('Nothing to do.\n', output)
233
233
        tree_a.commit('commit 2')
234
234
        tree_a.rename_one('file_2', 'file_ii')
235
235
        ## os.chdir('b')
236
 
        self.run_bzr('merge', 'a', '--uncommitted', '-d', 'b')
 
236
        self.run_bzr('merge a --uncommitted -d b')
237
237
        self.failUnlessExists('b/file_1')
238
238
        self.failUnlessExists('b/file_ii')
239
 
        tree_b.revert([])
 
239
        tree_b.revert()
240
240
        self.run_bzr_error(('Cannot use --uncommitted and --revision',),
241
 
                           'merge', '/a', '--uncommitted', '-r1',
242
 
                           '-d', 'b')
 
241
                           'merge /a --uncommitted -r1 -d b')
243
242
 
244
 
    def pullable_branch(self):
245
 
        os.mkdir('a')
246
 
        os.chdir('a')
247
 
        self.example_branch()
248
 
        os.chdir('..')
249
 
        self.runbzr('branch a b')
250
 
        os.chdir('b')
251
 
        file('goodbye', 'wt').write('quux')
252
 
        self.runbzr(['commit', '-m', "mode u's are always good"])
253
 
        os.chdir('../a')
 
243
    def test_merge_uncommitted_file(self):
 
244
        """It should be possible to merge changes from a single file."""
 
245
        tree_a = self.make_branch_and_tree('tree_a')
 
246
        tree_a.commit('initial commit')
 
247
        tree_a.bzrdir.sprout('tree_b')
 
248
        self.build_tree(['tree_a/file1', 'tree_a/file2'])
 
249
        tree_a.add(['file1', 'file2'])
 
250
        os.chdir('tree_b')
 
251
        self.run_bzr(['merge', '--uncommitted', '../tree_a/file1'])
 
252
        self.failUnlessExists('file1')
 
253
        self.failIfExists('file2')
254
254
 
255
255
    def pullable_branch(self):
256
256
        tree_a = self.make_branch_and_tree('a')
257
257
        self.build_tree(['a/file'])
258
258
        tree_a.add(['file'])
259
259
        self.id1 = tree_a.commit('commit 1')
260
 
        
 
260
 
261
261
        tree_b = self.make_branch_and_tree('b')
262
262
        tree_b.pull(tree_a.branch)
263
263
        file('b/file', 'wb').write('foo')
266
266
    def test_merge_pull(self):
267
267
        self.pullable_branch()
268
268
        os.chdir('a')
269
 
        (out, err) = self.run_bzr('merge', '--pull', '../b')
270
 
        self.assertContainsRe(err, 'Now on revision 2\\.')
 
269
        (out, err) = self.run_bzr('merge --pull ../b')
 
270
        self.assertContainsRe(out, 'Now on revision 2\\.')
271
271
        tree_a = WorkingTree.open('.')
272
272
        self.assertEqual([self.id2], tree_a.get_parent_ids())
273
273
 
281
281
        self.build_tree(['tree_a/file/'])
282
282
        tree_a.commit('changed file to directory')
283
283
        os.chdir('tree_b')
284
 
        self.run_bzr('merge', '../tree_a')
 
284
        self.run_bzr('merge ../tree_a')
285
285
        self.assertEqual('directory', file_kind('file'))
286
 
        tree_b.revert([])
 
286
        tree_b.revert()
287
287
        self.assertEqual('file', file_kind('file'))
288
288
        self.build_tree_contents([('file', 'content_2')])
289
289
        tree_b.commit('content change')
290
 
        self.run_bzr('merge', '../tree_a', retcode=1)
 
290
        self.run_bzr('merge ../tree_a', retcode=1)
291
291
        self.assertEqual(tree_b.conflicts(),
292
292
                         [ContentsConflict('file', file_id='file-id')])
 
293
 
 
294
    def test_directive_cherrypick(self):
 
295
        source = self.make_branch_and_tree('source')
 
296
        self.build_tree(['source/a'])
 
297
        source.add('a')
 
298
        source.commit('Added a', rev_id='rev1')
 
299
        self.build_tree(['source/b'])
 
300
        source.add('b')
 
301
        source.commit('Added b', rev_id='rev2')
 
302
        target = self.make_branch_and_tree('target')
 
303
        target.commit('empty commit')
 
304
        self.write_directive('directive', source.branch, 'target', 'rev2',
 
305
                             'rev1')
 
306
        out, err = self.run_bzr('merge -d target directive')
 
307
        self.failIfExists('target/a')
 
308
        self.failUnlessExists('target/b')
 
309
        self.assertContainsRe(err, 'Performing cherrypick')
 
310
 
 
311
    def write_directive(self, filename, source, target, revision_id,
 
312
                        base_revision_id=None, mangle_patch=False):
 
313
        md = merge_directive.MergeDirective2.from_objects(
 
314
            source.repository, revision_id, 0, 0, target,
 
315
            base_revision_id=base_revision_id)
 
316
        if mangle_patch:
 
317
            md.patch = 'asdf\n'
 
318
        self.build_tree_contents([(filename, ''.join(md.to_lines()))])
 
319
 
 
320
    def test_directive_verify_warning(self):
 
321
        source = self.make_branch_and_tree('source')
 
322
        self.build_tree(['source/a'])
 
323
        source.add('a')
 
324
        source.commit('Added a', rev_id='rev1')
 
325
        target = self.make_branch_and_tree('target')
 
326
        target.commit('empty commit')
 
327
        self.write_directive('directive', source.branch, 'target', 'rev1')
 
328
        err = self.run_bzr('merge -d target directive')[1]
 
329
        self.assertNotContainsRe(err, 'Preview patch does not match changes')
 
330
        target.revert()
 
331
        self.write_directive('directive', source.branch, 'target', 'rev1',
 
332
                             mangle_patch=True)
 
333
        err = self.run_bzr('merge -d target directive')[1]
 
334
        self.assertContainsRe(err, 'Preview patch does not match changes')
 
335
 
 
336
    def test_merge_arbitrary(self):
 
337
        target = self.make_branch_and_tree('target')
 
338
        target.commit('empty')
 
339
        # We need a revision that has no integer revno
 
340
        branch_a = target.bzrdir.sprout('branch_a').open_workingtree()
 
341
        self.build_tree(['branch_a/file1'])
 
342
        branch_a.add('file1')
 
343
        branch_a.commit('added file1', rev_id='rev2a')
 
344
        branch_b = target.bzrdir.sprout('branch_b').open_workingtree()
 
345
        self.build_tree(['branch_b/file2'])
 
346
        branch_b.add('file2')
 
347
        branch_b.commit('added file2', rev_id='rev2b')
 
348
        branch_b.merge_from_branch(branch_a.branch)
 
349
        self.failUnlessExists('branch_b/file1')
 
350
        branch_b.commit('merged branch_a', rev_id='rev3b')
 
351
 
 
352
        # It works if the revid has an interger revno
 
353
        self.run_bzr('merge -d target -r revid:rev2a branch_a')
 
354
        self.failUnlessExists('target/file1')
 
355
        self.failIfExists('target/file2')
 
356
        target.revert()
 
357
 
 
358
        # It should work if the revid has no integer revno
 
359
        self.run_bzr('merge -d target -r revid:rev2a branch_b')
 
360
        self.failUnlessExists('target/file1')
 
361
        self.failIfExists('target/file2')
 
362
 
 
363
    def assertDirectoryContent(self, directory, entries, message=''):
 
364
        """Assert whether entries (file or directories) exist in a directory.
 
365
        
 
366
        It also checks that there are no extra entries.
 
367
        """
 
368
        ondisk = os.listdir(directory)
 
369
        if set(ondisk) == set(entries):
 
370
            return
 
371
        if message:
 
372
            message += '\n'
 
373
        raise AssertionError(
 
374
            '%s"%s" directory content is different:\na = %s\nb = %s\n'
 
375
            % (message, directory, sorted(entries), sorted(ondisk)))
 
376
 
 
377
    def test_cherrypicking_merge(self):
 
378
        # make source branch
 
379
        source = self.make_branch_and_tree('source')
 
380
        for f in ('a', 'b', 'c', 'd'):
 
381
            self.build_tree(['source/'+f])
 
382
            source.add(f)
 
383
            source.commit('added '+f, rev_id='rev_'+f)
 
384
        # target branch
 
385
        target = source.bzrdir.sprout('target', 'rev_a').open_workingtree()
 
386
        self.assertDirectoryContent('target', ['.bzr', 'a'])
 
387
        # pick 1 revision
 
388
        self.run_bzr('merge -d target -r revid:rev_b..revid:rev_c source')
 
389
        self.assertDirectoryContent('target', ['.bzr', 'a', 'c'])
 
390
        target.revert()
 
391
        # pick 2 revisions
 
392
        self.run_bzr('merge -d target -r revid:rev_b..revid:rev_d source')
 
393
        self.assertDirectoryContent('target', ['.bzr', 'a', 'c', 'd'])
 
394
        target.revert()
 
395
        # pick 1 revision with option --changes
 
396
        self.run_bzr('merge -d target -c revid:rev_d source')
 
397
        self.assertDirectoryContent('target', ['.bzr', 'a', 'd'])
 
398
 
 
399
    def test_merge_criss_cross(self):
 
400
        tree_a = self.make_branch_and_tree('a')
 
401
        tree_a.commit('', rev_id='rev1')
 
402
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
 
403
        tree_a.commit('', rev_id='rev2a')
 
404
        tree_b.commit('', rev_id='rev2b')
 
405
        tree_a.merge_from_branch(tree_b.branch)
 
406
        tree_b.merge_from_branch(tree_a.branch)
 
407
        tree_a.commit('', rev_id='rev3a')
 
408
        tree_b.commit('', rev_id='rev3b')
 
409
        graph = tree_a.branch.repository.get_graph(tree_b.branch.repository)
 
410
        out, err = self.run_bzr(['merge', '-d', 'a', 'b'])
 
411
        self.assertContainsRe(err, 'Warning: criss-cross merge encountered.')
 
412
 
 
413
    def test_weave_cherrypick(self):
 
414
        this_tree = self.make_branch_and_tree('this')
 
415
        self.build_tree_contents([('this/file', "a\n")])
 
416
        this_tree.add('file')
 
417
        this_tree.commit('rev1')
 
418
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
 
419
        self.build_tree_contents([('other/file', "a\nb\n")])
 
420
        other_tree.commit('rev2b')
 
421
        self.build_tree_contents([('other/file', "c\na\nb\n")])
 
422
        other_tree.commit('rev3b')
 
423
        self.run_bzr('merge --weave -d this other -r -2..-1')
 
424
        self.assertFileEqual('c\na\n', 'this/file')
 
425
 
 
426
    def test_lca_merge_criss_cross(self):
 
427
        tree_a = self.make_branch_and_tree('a')
 
428
        self.build_tree_contents([('a/file', 'base-contents\n')])
 
429
        tree_a.add('file')
 
430
        tree_a.commit('', rev_id='rev1')
 
431
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
 
432
        self.build_tree_contents([('a/file',
 
433
                                   'base-contents\nthis-contents\n')])
 
434
        tree_a.commit('', rev_id='rev2a')
 
435
        self.build_tree_contents([('b/file',
 
436
                                   'base-contents\nother-contents\n')])
 
437
        tree_b.commit('', rev_id='rev2b')
 
438
        tree_a.merge_from_branch(tree_b.branch)
 
439
        self.build_tree_contents([('a/file',
 
440
                                   'base-contents\nthis-contents\n')])
 
441
        tree_a.set_conflicts(ConflictList())
 
442
        tree_b.merge_from_branch(tree_a.branch)
 
443
        self.build_tree_contents([('b/file',
 
444
                                   'base-contents\nother-contents\n')])
 
445
        tree_b.set_conflicts(ConflictList())
 
446
        tree_a.commit('', rev_id='rev3a')
 
447
        tree_b.commit('', rev_id='rev3b')
 
448
        out, err = self.run_bzr(['merge', '-d', 'a', 'b', '--lca'], retcode=1)
 
449
        self.assertFileEqual('base-contents\n<<<<<<< TREE\nthis-contents\n'
 
450
                             '=======\nother-contents\n>>>>>>> MERGE-SOURCE\n',
 
451
                             'a/file')