bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
821
by Martin Pool
- start code for built-in diff3-style resolve |
1 |
# Copyright (C) 2004, 2005 by Canonical Ltd
|
2 |
||
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.
|
|
7 |
||
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.
|
|
12 |
||
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
|
|
16 |
||
17 |
||
18 |
from bzrlib.selftest import InTempDir, TestBase |
|
19 |
from bzrlib.merge3 import Merge3 |
|
20 |
||
21 |
class NoConflicts(TestBase): |
|
22 |
"""No conflicts because only one side changed""" |
|
23 |
def runTest(self): |
|
24 |
m3 = Merge3(['aaa', 'bbb'], |
|
25 |
['aaa', '111', 'bbb'], |
|
26 |
['aaa', 'bbb']) |
|
27 |
||
28 |
self.assertEquals(m3.find_unconflicted(), |
|
29 |
[(0, 1), (1, 2)]) |
|
30 |
||
31 |
||
32 |
class NoChanges(TestBase): |
|
33 |
"""No conflicts because nothing changed""" |
|
34 |
def runTest(self): |
|
35 |
m3 = Merge3(['aaa', 'bbb'], |
|
36 |
['aaa', 'bbb'], |
|
37 |
['aaa', 'bbb']) |
|
38 |
||
39 |
self.assertEquals(m3.find_unconflicted(), |
|
40 |
[(0, 2)]) |
|
41 |
||
42 |
||
43 |
||
44 |
class InsertClash(TestBase): |
|
45 |
"""Both try to insert lines in the same place.""" |
|
46 |
def runTest(self): |
|
47 |
m3 = Merge3(['aaa', 'bbb'], |
|
48 |
['aaa', '111', 'bbb'], |
|
49 |
['aaa', '222', 'bbb']) |
|
50 |
||
51 |
self.assertEquals(m3.find_unconflicted(), |
|
52 |
[(0, 1), (1, 2)]) |
|
53 |
||
54 |
||
55 |
||
56 |
||
57 |
||
58 |
class ReplaceClash(TestBase): |
|
59 |
"""Both try to insert lines in the same place.""" |
|
60 |
def runTest(self): |
|
61 |
m3 = Merge3(['aaa', '000', 'bbb'], |
|
62 |
['aaa', '111', 'bbb'], |
|
63 |
['aaa', '222', 'bbb']) |
|
64 |
||
65 |
self.assertEquals(m3.find_unconflicted(), |
|
66 |
[(0, 1), (2, 3)]) |
|
67 |
||
68 |