1
# Copyright (C) 2010 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21
from bzrlib.tests import script
22
from bzrlib.tests.blackbox import test_conflicts
25
class TestResolve(script.TestCaseWithTransportAndScript):
28
super(TestResolve, self).setUp()
29
test_conflicts.make_tree_with_conflicts(self, 'branch', 'other')
31
def test_resolve_one_by_one(self):
35
Text conflict in my_other_file
36
Path conflict: mydir3 / mydir2
37
Text conflict in myfile
39
2>1 conflict(s) resolved, 2 remaining
40
$ bzr resolve my_other_file
41
2>1 conflict(s) resolved, 1 remaining
43
2>1 conflict(s) resolved, 0 remaining
46
def test_resolve_all(self):
50
2>3 conflict(s) resolved, 0 remaining
54
def test_resolve_from_subdir(self):
58
$ bzr resolve ../myfile
59
2>1 conflict(s) resolved, 2 remaining
62
def test_resolve_via_directory_option(self):
64
$ bzr resolve -d branch myfile
65
2>1 conflict(s) resolved, 2 remaining
68
def test_resolve_all_via_directory_option(self):
70
$ bzr resolve -d branch --all
71
2>3 conflict(s) resolved, 0 remaining
72
$ bzr conflicts -d branch
76
class TestResolveAuto(tests.TestCaseWithTransport):
78
def test_auto_resolve(self):
79
"""Text conflicts can be resolved automatically"""
80
tree = self.make_branch_and_tree('tree')
81
self.build_tree_contents([('tree/file',
82
'<<<<<<<\na\n=======\n>>>>>>>\n')])
83
tree.add('file', 'file_id')
84
self.assertEqual(tree.kind('file_id'), 'file')
85
file_conflict = conflicts.TextConflict('file', file_id='file_id')
86
tree.set_conflicts(conflicts.ConflictList([file_conflict]))
87
note = self.run_bzr('resolve', retcode=1, working_dir='tree')[1]
88
self.assertContainsRe(note, '0 conflict\\(s\\) auto-resolved.')
89
self.assertContainsRe(note,
90
'Remaining conflicts:\nText conflict in file')
91
self.build_tree_contents([('tree/file', 'a\n')])
92
note = self.run_bzr('resolve', working_dir='tree')[1]
93
self.assertContainsRe(note, 'All conflicts resolved.')