/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_textmerge.py

• browse files at revision 7498.1.1
• compare with another revision
• download diff
• download tarball
• view history from revision 7498.1.1

• reverse the comparison (7498.1.1 to 6858.1.1)
• stop comparing with revision 6858.1.1

Show diffs side-by-side

added

removed

breezy/tests/test_textmerge.py

17

17

# Author: Aaron Bentley <aaron.bentley@utoronto.ca>

18

18

from breezy.textmerge import Merge2

19

19

from breezy.tests import TestCase

 

20

 

 

21

 

20

22

class TestMerge2(TestCase):

21

23

    def test_agreed(self):

22

24

        lines = "a\nb\nc\nd\ne\nf\n".splitlines(True)

29

31

        expected = "<\na\n=\nz\n>\nb\n<\nc\n=\nx\n>\nd\ne\n<\n=\ne\n>\nf\n"\

30

32

                   "g\n<\nh\n=\ny\n>\n"

31

33

        m2 = Merge2(lines_a, lines_b, '<\n', '>\n', '=\n')

32

 

        mlines= m2.merge_lines()[0]

 

34

        mlines = m2.merge_lines()[0]

33

35

        self.assertEqualDiff(''.join(mlines), expected)

34

 

        mlines= m2.merge_lines(reprocess=True)[0]

 

36

        mlines = m2.merge_lines(reprocess=True)[0]

35

37

        self.assertEqualDiff(''.join(mlines), expected)

36

38

 

37

39

    def test_reprocess(self):

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0