← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_diff.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-08-20 14:19:21 UTC
  • mfrom: (2598.5.19 nullrevision)
  • Revision ID: pqm@pqm.ubuntu.com-20070820141921-kmbpaev7g9epuy08
NULL_REVISION is returned to indicate the null revision, not None

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
209
209
        print >> open('branch1/file1', 'wb'), 'new line'
210
210
        output = self.run_bzr('diff -r 1.. branch1',
211
211
                              retcode=1)
212
 
        self.assertTrue('\n-original line\n+new line\n' in output[0])
 
212
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
213
213
 
214
214
    def test_diff_across_rename(self):
215
215
        """The working tree path should always be considered for diffing"""