40
35
def test_pending(self):
41
36
wt = self.make_branch_and_tree('.')
42
rev_a = wt.commit("lala!")
43
self.assertEqual([rev_a], wt.get_parent_ids())
44
_merge_helper([u'.', -1], [None, None])
45
self.assertEqual([rev_a], wt.get_parent_ids())
38
self.assertEquals(len(wt.pending_merges()), 0)
39
merge([u'.', -1], [None, None])
40
self.assertEquals(len(wt.pending_merges()), 0)
47
42
def test_undo(self):
48
43
wt = self.make_branch_and_tree('.')
51
46
wt.commit("blabla!")
52
_merge_helper([u'.', 2], [u'.', 1])
47
merge([u'.', 2], [u'.', 1])
54
49
def test_nocommits(self):
55
50
self.test_pending()
56
51
wt2 = self.make_branch_and_tree('branch2')
57
self.assertRaises(NoCommits, _merge_helper, ['branch2', -1],
52
self.assertRaises(NoCommits, merge, ['branch2', -1],
61
56
def test_unrelated(self):
62
57
wt2 = self.test_nocommits()
64
self.assertRaises(UnrelatedBranches, _merge_helper, ['branch2', -1],
59
self.assertRaises(UnrelatedBranches, merge, ['branch2', -1],
68
def test_merge_one_file(self):
69
"""Do a partial merge of a tree which should not affect tree parents."""
63
def test_merge_one(self):
70
64
wt1 = self.make_branch_and_tree('branch1')
71
tip = wt1.commit('empty commit')
65
wt1.commit('empty commit')
72
66
wt2 = self.make_branch_and_tree('branch2')
73
67
wt2.pull(wt1.branch)
74
68
file('branch1/foo', 'wb').write('foo')
78
72
wt1.commit('add foobar')
79
73
os.chdir('branch2')
80
self.run_bzr('merge ../branch1/baz', retcode=3)
81
self.run_bzr('merge ../branch1/foo')
74
self.run_bzr('merge', '../branch1/baz', retcode=3)
75
self.run_bzr('merge', '../branch1/foo')
82
76
self.failUnlessExists('foo')
83
77
self.failIfExists('bar')
84
wt2 = WorkingTree.open('.') # opens branch2
85
self.assertEqual([tip], wt2.get_parent_ids())
78
wt2 = WorkingTree.open_containing('branch2')[0]
79
self.assertEqual(wt2.pending_merges(), [])
87
81
def test_pending_with_null(self):
88
"""When base is forced to revno 0, parent_ids are set"""
82
"""When base is forced to revno 0, pending_merges is set"""
89
83
wt2 = self.test_unrelated()
90
84
wt1 = WorkingTree.open('.')
92
86
br1.fetch(wt2.branch)
93
87
# merge all of branch 2 into branch 1 even though they
95
self.assertRaises(BzrCommandError, _merge_helper, ['branch2', -1],
89
self.assertRaises(BzrCommandError, merge, ['branch2', -1],
96
90
['branch2', 0], reprocess=True, show_base=True)
97
_merge_helper(['branch2', -1], ['branch2', 0], reprocess=True)
98
self.assertEqual([br1.last_revision(), wt2.branch.last_revision()],
91
merge(['branch2', -1], ['branch2', 0], reprocess=True)
92
self.assertEquals(len(wt1.pending_merges()), 1)
100
93
return (wt1, wt2.branch)
102
95
def test_two_roots(self):
153
146
tree_a.set_conflicts(ConflictList([TextConflict('patha')]))
154
147
merge_inner(tree_a.branch, tree_a, tree_a, this_tree=tree_a)
155
148
self.assertEqual(1, len(tree_a.conflicts()))
157
def test_rmdir_conflict(self):
158
tree_a = self.make_branch_and_tree('a')
159
self.build_tree(['a/b/'])
160
tree_a.add('b', 'b-id')
161
tree_a.commit('added b')
162
# basis_tree() is only guaranteed to be valid as long as it is actually
163
# the basis tree. This mutates the tree after grabbing basis, so go to
165
base_tree = tree_a.branch.repository.revision_tree(tree_a.last_revision())
166
tree_z = tree_a.bzrdir.sprout('z').open_workingtree()
167
self.build_tree(['a/b/c'])
169
tree_a.commit('added c')
171
tree_z.commit('removed b')
172
merge_inner(tree_z.branch, tree_a, base_tree, this_tree=tree_z)
174
conflicts.MissingParent('Created directory', 'b', 'b-id'),
175
conflicts.UnversionedParent('Versioned directory', 'b', 'b-id')],
177
merge_inner(tree_a.branch, tree_z.basis_tree(), base_tree,
180
conflicts.DeletingParent('Not deleting', 'b', 'b-id'),
181
conflicts.UnversionedParent('Versioned directory', 'b', 'b-id')],
184
def test_nested_merge(self):
185
tree = self.make_branch_and_tree('tree',
186
format='dirstate-with-subtree')
187
sub_tree = self.make_branch_and_tree('tree/sub-tree',
188
format='dirstate-with-subtree')
189
sub_tree.set_root_id('sub-tree-root')
190
self.build_tree_contents([('tree/sub-tree/file', 'text1')])
192
sub_tree.commit('foo')
193
tree.add_reference(sub_tree)
194
tree.commit('set text to 1')
195
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
196
# modify the file in the subtree
197
self.build_tree_contents([('tree2/sub-tree/file', 'text2')])
198
# and merge the changes from the diverged subtree into the containing
200
tree2.commit('changed file text')
201
tree.merge_from_branch(tree2.branch)
202
self.assertFileEqual('text2', 'tree/sub-tree/file')
204
def test_merge_with_missing(self):
205
tree_a = self.make_branch_and_tree('tree_a')
206
self.build_tree_contents([('tree_a/file', 'content_1')])
208
tree_a.commit('commit base')
209
# basis_tree() is only guaranteed to be valid as long as it is actually
210
# the basis tree. This mutates the tree after grabbing basis, so go to
212
base_tree = tree_a.branch.repository.revision_tree(tree_a.last_revision())
213
tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
214
self.build_tree_contents([('tree_a/file', 'content_2')])
215
tree_a.commit('commit other')
216
other_tree = tree_a.basis_tree()
217
os.unlink('tree_b/file')
218
merge_inner(tree_b.branch, other_tree, base_tree, this_tree=tree_b)
220
def test_merge_kind_change(self):
221
tree_a = self.make_branch_and_tree('tree_a')
222
self.build_tree_contents([('tree_a/file', 'content_1')])
223
tree_a.add('file', 'file-id')
224
tree_a.commit('added file')
225
tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
226
os.unlink('tree_a/file')
227
self.build_tree(['tree_a/file/'])
228
tree_a.commit('changed file to directory')
229
tree_b.merge_from_branch(tree_a.branch)
230
self.assertEqual('directory', file_kind('tree_b/file'))
232
self.assertEqual('file', file_kind('tree_b/file'))
233
self.build_tree_contents([('tree_b/file', 'content_2')])
234
tree_b.commit('content change')
235
tree_b.merge_from_branch(tree_a.branch)
236
self.assertEqual(tree_b.conflicts(),
237
[conflicts.ContentsConflict('file',
240
def test_merge_type_registry(self):
241
merge_type_option = option.Option.OPTIONS['merge-type']
242
self.assertFalse('merge4' in [x[0] for x in
243
merge_type_option.iter_switches()])
244
registry = _mod_merge.get_merge_type_registry()
245
registry.register_lazy('merge4', 'bzrlib.merge', 'Merge4Merger',
246
'time-travelling merge')
247
self.assertTrue('merge4' in [x[0] for x in
248
merge_type_option.iter_switches()])
249
registry.remove('merge4')
250
self.assertFalse('merge4' in [x[0] for x in
251
merge_type_option.iter_switches()])
253
def test_merge_other_moves_we_deleted(self):
254
tree_a = self.make_branch_and_tree('A')
256
self.addCleanup(tree_a.unlock)
257
self.build_tree(['A/a'])
259
tree_a.commit('1', rev_id='rev-1')
261
tree_a.rename_one('a', 'b')
263
bzrdir_b = tree_a.bzrdir.sprout('B', revision_id='rev-1')
264
tree_b = bzrdir_b.open_workingtree()
266
self.addCleanup(tree_b.unlock)
270
tree_b.merge_from_branch(tree_a.branch)
271
except AttributeError:
272
self.fail('tried to join a path when name was None')