/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2007-07-25 05:24:39 UTC
  • mto: This revision was merged to the branch mainline in revision 2733.
  • Revision ID: aaron.bentley@utoronto.ca-20070725052439-t6hzz6o142as6wmd
Return NULL_REVISION instead of None for the null revision

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
        raise output[0]
 
213
        self.assertContainsRe('\n\\-original line\n\\+new line\n', output[0])
213
214
 
214
215
    def test_diff_across_rename(self):
215
216
        """The working tree path should always be considered for diffing"""