1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
# Copyright (C) 2005 by Canonical Ltd
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import os
from bzrlib.selftest import TestCaseInTempDir
from bzrlib.branch import Branch
from bzrlib.commit import Commit
from bzrlib.conflicts import restore
from bzrlib.errors import NotConflicted
# TODO: Test commit with some added, and added-but-missing files
class TestConflicts(TestCaseInTempDir):
def test_conflicts(self):
"""Conflicts are detected properly"""
b = Branch.initialize('.')
file('hello', 'w').write('hello world4')
file('hello.THIS', 'w').write('hello world2')
file('hello.BASE', 'w').write('hello world1')
file('hello.OTHER', 'w').write('hello world3')
file('hello.sploo.BASE', 'w').write('yellow world')
file('hello.sploo.OTHER', 'w').write('yellow world2')
tree = b.working_tree()
self.assertEqual(len(list(tree.list_files())), 6)
conflicts = list(tree.iter_conflicts())
self.assertEqual(len(conflicts), 2)
assert 'hello' in conflicts
assert 'hello.sploo' in conflicts
restore('hello')
restore('hello.sploo')
self.assertEqual(len(list(tree.iter_conflicts())), 0)
self.assertFileEqual('hello world2', 'hello')
assert not os.path.lexists('hello.sploo')
self.assertRaises(NotConflicted, restore, 'hello')
self.assertRaises(NotConflicted, restore, 'hello.sploo')
|