← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_weave.py

  • Committer: Aaron Bentley
  • Date: 2006-04-18 13:43:48 UTC
  • mto: This revision was merged to the branch mainline in revision 1672.
  • Revision ID: abentley@panoramicfeedback.com-20060418134348-a1ff927ea2817900
Fix WeaveMerge when plan doesn't end with unchanged lines

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_weave.py
796
796
        self.log(result_text)
797
797
        self.assertEqualDiff(result_text, expected)
798
798
 
 
799
    def test_weave_merge_conflicts(self):
 
800
        # does weave merge properly handle plans that end with unchanged?
 
801
        result = ''.join(Weave().weave_merge([('new-a', 'hello\n')]))
 
802
        self.assertEqual(result, 'hello\n')
 
803
 
799
804
    def test_deletion_extended(self):
800
805
        """One side deletes, the other deletes more.
801
806
        """