38
38
self.tree_from = self.make_branch_and_tree('from')
39
39
self.first_rev = self.tree_from.commit('first post')
40
self.tree_to = self.tree_from.controldir.sprout('to').open_workingtree()
41
self.second_rev = self.tree_from.commit('second rev on from', allow_pointless=True)
42
self.to_second_rev = self.tree_to.commit('second rev on to', allow_pointless=True)
40
self.tree_to = self.tree_from.controldir.sprout(
41
'to').open_workingtree()
42
self.second_rev = self.tree_from.commit(
43
'second rev on from', allow_pointless=True)
44
self.to_second_rev = self.tree_to.commit(
45
'second rev on to', allow_pointless=True)
44
47
def test_smoking_merge(self):
45
48
"""Smoke test of merge_from_branch."""
46
49
self.create_two_trees_for_merging()
47
50
self.tree_to.merge_from_branch(self.tree_from.branch)
48
51
self.assertEqual([self.to_second_rev, self.second_rev],
49
self.tree_to.get_parent_ids())
52
self.tree_to.get_parent_ids())
51
54
def test_merge_to_revision(self):
52
55
"""Merge from a branch to a revision that is not the tip."""
53
56
self.create_two_trees_for_merging()
54
57
self.third_rev = self.tree_from.commit('real_tip')
55
58
self.tree_to.merge_from_branch(self.tree_from.branch,
56
to_revision=self.second_rev)
59
to_revision=self.second_rev)
57
60
self.assertEqual([self.to_second_rev, self.second_rev],
58
self.tree_to.get_parent_ids())
61
self.tree_to.get_parent_ids())
60
63
def test_compare_after_merge(self):
61
64
tree_a = self.make_branch_and_tree('tree_a')
93
96
self.build_tree_contents([('tree_b/file', b'text-b')])
94
97
tree_b.commit('changed file')
95
98
self.assertRaises(errors.PointlessMerge, tree_a.merge_from_branch,
96
tree_b.branch, from_revision=tree_b.branch.last_revision())
99
tree_b.branch, from_revision=tree_b.branch.last_revision())
97
100
tree_a.merge_from_branch(tree_b.branch, from_revision=rev1)
98
101
tree_a.lock_read()
99
102
self.addCleanup(tree_a.unlock)
110
113
other.commit('content -> bar')
111
114
self.build_tree_contents([('this/foo', b'baz')])
112
115
this.commit('content -> baz')
113
117
class QuxMerge(merge.Merge3Merger):
114
118
def text_merge(self, trans_id, paths, file_id):
115
119
self.tt.create_file([b'qux'], trans_id)
136
140
rev5 = bld_inner.build_snapshot(
137
141
[rev4], [('rename', ('file4', 'dir/file4'))])
138
142
rev3 = bld_inner.build_snapshot(
139
[rev1], [('modify', ('file3', b'new file3 contents\n')),])
143
[rev1], [('modify', ('file3', b'new file3 contents\n')), ])
140
144
rev2 = bld_inner.build_snapshot(
142
146
[('add', ('dir/file2', None, 'file', b'file2 content\n')),
159
163
outer.commit('added foo')
160
164
inner, revs = self.make_inner_branch()
161
outer.merge_from_branch(inner, to_revision=revs[0], from_revision=b'null:')
162
#retain original root id.
165
outer.merge_from_branch(
166
inner, to_revision=revs[0], from_revision=b'null:')
167
# retain original root id.
163
168
if outer.supports_setting_file_ids():
164
169
outer.set_root_id(outer.basis_tree().get_root_id())
165
170
outer.commit('merge inner branch')
added
removed
breezy/tests/per_workingtree/test_merge_from_branch.py
