1
# Copyright (C) 2005, 2006 by 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 TestCaseWithTransport
22
from bzrlib.branch import Branch
23
from bzrlib.errors import PointlessCommit, BzrError
24
from bzrlib.tests.test_revision import make_branches
27
class TestCommitMerge(TestCaseWithTransport):
28
"""Tests for committing the results of a merge.
30
These don't currently test the merge code, which is intentional to
31
reduce the scope of testing. We just mark the revision as merged
32
without bothering about the contents much."""
34
def test_merge_commit_empty(self):
35
"""Simple commit of two-way merge of empty trees."""
36
wtx = self.make_branch_and_tree('x')
37
base_rev = wtx.commit('common parent')
39
wty = wtx.bzrdir.sprout('y').open_workingtree()
42
wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
43
wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
45
self.assertEqual((1, []), by.fetch(bx))
46
# just having the history there does nothing
47
self.assertRaises(PointlessCommit,
49
'no changes yet', rev_id='y@u-0-2',
50
allow_pointless=False)
51
wty.merge_from_branch(bx)
52
wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
54
self.assertEquals(by.revno(), 3)
55
self.assertEquals(list(by.revision_history()),
56
[base_rev, 'y@u-0-1', 'y@u-0-2'])
57
rev = by.repository.get_revision('y@u-0-2')
58
self.assertEquals(rev.parent_ids,
59
['y@u-0-1', 'x@u-0-1'])
61
def test_merge_new_file(self):
62
"""Commit merge of two trees with no overlapping files."""
63
wtx = self.make_branch_and_tree('x')
64
base_rev = wtx.commit('common parent')
66
wty = wtx.bzrdir.sprout('y').open_workingtree()
69
self.build_tree(['x/ecks', 'y/why'])
71
wtx.add(['ecks'], ['ecks-id'])
72
wty.add(['why'], ['why-id'])
74
wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
75
wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
77
wty.merge_from_branch(bx)
79
# partial commit of merges is currently not allowed, because
80
# it would give different merge graphs for each file which
81
# might be complex. it can be allowed in the future.
82
self.assertRaises(Exception,
84
'partial commit', allow_pointless=False,
85
specific_files=['ecks'])
87
wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
88
tree = by.repository.revision_tree('y@u-0-2')
90
self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
91
self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
95
bx.repository.check([bx.last_revision()])
96
by.repository.check([by.last_revision()])
added
removed
bzrlib/tests/test_commit_merge.py
