1
# Copyright (C) 2006 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
17
# Author: Aaron Bentley <aaron.bentley@utoronto.ca>
18
from bzrlib.textmerge import Merge2
19
from bzrlib.tests import TestCase
20
class TestMerge2(TestCase):
21
def test_agreed(self):
22
lines = "a\nb\nc\nd\ne\nf\n".splitlines(True)
23
mlines = list(Merge2(lines, lines).merge_lines()[0])
24
self.assertEqualDiff(mlines, lines)
26
def test_conflict(self):
27
lines_a = "a\nb\nc\nd\ne\nf\ng\nh\n".splitlines(True)
28
lines_b = "z\nb\nx\nd\ne\ne\nf\ng\ny\n".splitlines(True)
29
expected = "<\na\n=\nz\n>\nb\n<\nc\n=\nx\n>\nd\n<\n=\ne\n>\ne\nf\n"\
31
m2 = Merge2(lines_a, lines_b, '<\n', '>\n', '=\n')
32
mlines= m2.merge_lines()[0]
33
self.assertEqualDiff(''.join(mlines), expected)
34
mlines= m2.merge_lines(reprocess=True)[0]
35
self.assertEqualDiff(''.join(mlines), expected)
37
def test_reprocess(self):
38
struct = [('a', 'b'), ('c',), ('def','geh'), ('i',)]
39
expect = [('a', 'b'), ('c',), ('d', 'g'), ('e',), ('f', 'h'), ('i',)]
40
result = Merge2.reprocess_struct(struct)
41
self.assertEqual(list(result), expect)
added
removed
bzrlib/tests/test_textmerge.py
