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
2
18
from StringIO import StringIO
4
20
from bzrlib.branch import Branch
5
21
from bzrlib.builtins import merge
6
from bzrlib.commit import commit
22
from bzrlib.conflicts import ConflictList, TextConflict
7
23
from bzrlib.errors import UnrelatedBranches, NoCommits, BzrCommandError
8
24
from bzrlib.merge import transform_tree, merge_inner
9
25
from bzrlib.osutils import pathjoin
124
140
this_tree=tree_b, ignore_zero=False)
125
141
log = self._get_log()
126
142
self.failUnless('All changes applied successfully.\n' in log)
144
def test_merge_inner_conflicts(self):
145
tree_a = self.make_branch_and_tree('a')
146
tree_a.set_conflicts(ConflictList([TextConflict('patha')]))
147
merge_inner(tree_a.branch, tree_a, tree_a, this_tree=tree_a)
148
self.assertEqual(1, len(tree_a.conflicts()))
added
removed
bzrlib/tests/test_merge.py
