← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_diff.py

  • Committer: John Arbash Meinel
  • Date: 2007-04-11 22:05:16 UTC
  • mto: This revision was merged to the branch mainline in revision 2408.
  • Revision ID: john@arbash-meinel.com-20070411220516-bz4941rayeilvjac
Do a better fix, which recognizes that we should pass the correct old path.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_diff.py
392
392
        self.assertContainsRe(diff, "=== modified file 'other/file'\n")
393
393
        # XXX: This is technically incorrect, because it used to be at another
394
394
        # location. What to do?
395
 
        self.assertContainsRe(diff, '--- old/other/file\t')
 
395
        self.assertContainsRe(diff, '--- old/dir/file\t')
396
396
        self.assertContainsRe(diff, '\\+\\+\\+ new/other/file\t')
397
397
        self.assertContainsRe(diff, '-contents\n'
398
398
                                    '\\+new contents\n')