/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: Martin Pool
  • Date: 2007-08-28 02:02:09 UTC
  • mfrom: (2749 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2758.
  • Revision ID: mbp@sourcefrog.net-20070828020209-gbhb0onl14e1fjty
merge trunk

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"""