← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_multiparent.py

  • Committer: Aaron Bentley
  • Date: 2007-07-24 01:39:52 UTC
  • mto: This revision was merged to the branch mainline in revision 2699.
  • Revision ID: aaron.bentley@utoronto.ca-20070724013952-isph0r8pe5hgavw1
Fix benign off-by-one error generating mpdiffs

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_multiparent.py
49
49
                          multiparent.ParentText(0, 1, 2, 3)],
50
50
                         diff.hunks)
51
51
 
 
52
        diff = multiparent.MultiParent.from_lines(LINES_2, [LINES_1])
 
53
        self.assertEqual([multiparent.ParentText(0, 0, 0, 1),
 
54
                          multiparent.ParentText(0, 2, 1, 3)],
 
55
                         diff.hunks)
 
56
 
52
57
    def test_compare_two_parents(self):
53
58
        diff = multiparent.MultiParent.from_lines(LINES_1, [LINES_2, LINES_3])
54
59
        self.assertEqual([multiparent.ParentText(1, 0, 0, 4),