1
# Copyright (C) 2005, 2006 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21
from bzrlib.tests import (
22
TestCaseWithTransport,
25
from bzrlib.branch import Branch
26
from bzrlib.errors import PointlessCommit, BzrError
27
from bzrlib.tests.test_revision import make_branches
28
from bzrlib import osutils
31
class TestCommitMerge(TestCaseWithTransport):
32
"""Tests for committing the results of a merge.
34
These don't currently test the merge code, which is intentional to
35
reduce the scope of testing. We just mark the revision as merged
36
without bothering about the contents much."""
38
def test_merge_commit_empty(self):
39
"""Simple commit of two-way merge of empty trees."""
40
wtx = self.make_branch_and_tree('x')
41
base_rev = wtx.commit('common parent')
43
wty = wtx.bzrdir.sprout('y').open_workingtree()
46
wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
47
wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
49
self.assertEqual((1, []), by.fetch(bx))
50
# just having the history there does nothing
51
self.assertRaises(PointlessCommit,
53
'no changes yet', rev_id='y@u-0-2',
54
allow_pointless=False)
55
wty.merge_from_branch(bx)
56
wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
58
self.assertEquals(by.revno(), 3)
59
self.assertEquals(list(by.revision_history()),
60
[base_rev, 'y@u-0-1', 'y@u-0-2'])
61
rev = by.repository.get_revision('y@u-0-2')
62
self.assertEquals(rev.parent_ids,
63
['y@u-0-1', 'x@u-0-1'])
65
def test_merge_new_file(self):
66
"""Commit merge of two trees with no overlapping files."""
67
wtx = self.make_branch_and_tree('x')
68
base_rev = wtx.commit('common parent')
70
wtx.commit('establish root id')
71
wty = wtx.bzrdir.sprout('y').open_workingtree()
72
self.assertEqual(wtx.get_root_id(), wty.get_root_id())
75
self.build_tree(['x/ecks', 'y/why'])
77
wtx.add(['ecks'], ['ecks-id'])
78
wty.add(['why'], ['why-id'])
80
wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
81
wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
83
wty.merge_from_branch(bx)
85
# partial commit of merges is currently not allowed, because
86
# it would give different merge graphs for each file which
87
# might be complex. it can be allowed in the future.
88
self.assertRaises(Exception,
90
'partial commit', allow_pointless=False,
91
specific_files=['ecks'])
93
wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
94
tree = by.repository.revision_tree('y@u-0-2')
96
self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
97
self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
101
bx.repository.check([bx.last_revision()])
102
by.repository.check([by.last_revision()])
104
def test_merge_with_symlink(self):
105
if not osutils.has_symlinks():
106
raise TestSkipped('Symlinks are not supported on this platform')
107
tree_a = self.make_branch_and_tree('tree_a')
108
os.symlink('target', osutils.pathjoin('tree_a', 'link'))
110
tree_a.commit('added link')
111
tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
112
self.build_tree(['tree_a/file'])
114
tree_a.commit('added file')
115
self.build_tree(['tree_b/another_file'])
116
tree_b.add('another_file')
117
tree_b.commit('add another file')
118
tree_b.merge_from_branch(tree_a.branch)
119
tree_b.commit('merge')
added
removed
bzrlib/tests/test_commit_merge.py
