← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testmerge3.py

  • Committer: John Arbash Meinel
  • Date: 2005-11-10 03:38:19 UTC
  • mto: This revision was merged to the branch mainline in revision 1727.
  • Revision ID: john@arbash-meinel.com-20051110033819-a2a0829773b88f80
Added (failing) tests for cdv.recurse_matches with common sections,
moved codeville code into separate directory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testmerge3.py
313
313
        optimal_text = "a\n" * 10 + "<<<<<<< OTHER\nc\n=======\n>>>>>>> THIS"\
314
314
            + "\n" + 8* "b\n" + "<<<<<<< OTHER\nc\n=======\nb\nb\n>>>>>>>"\
315
315
            + " THIS\n"
316
 
        self.assertEqualDiff(merged_text, optimal_text)
 
316
        if merged_text != optimal_text:
 
317
            print 'Base: ' + ('*' * 24)
 
318
            print ''.join(base_text)
 
319
            print 'This: ' + ('*' * 24)
 
320
            print ''.join(this_text)
 
321
            print 'Other: ' + ('*' * 23)
 
322
            print ''.join(other_text)
 
323
            print 'Expected: ' + ('*' * 20)
 
324
            print optimal_text
 
325
            print 'Received: ' + ('*' * 20)
 
326
            print merged_text
 
327
        self.assertEquals(merged_text, optimal_text)
317
328
 
318
329
    def test_reprocess_and_base(self):
319
330
        """Reprocessing and showing base breaks correctly"""