← 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-02-13 20:33:57 UTC
  • mfrom: (2283 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2294.
  • Revision ID: john@arbash-meinel.com-20070213203357-b7yg41mi9sk6cqd0
[merge] bzr.dev 2283
resolve conflicts in moved repository formats
small issue with osutils.contains_whitespace()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_diff.py
205
205
        # Make sure external_diff doesn't fail in the current LANG
206
206
        lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
207
207
 
208
 
        cmd = ['diff', '-u', 'old', 'new']
 
208
        cmd = ['diff', '-u', '--binary', 'old', 'new']
209
209
        open('old', 'wb').write('\x00foobar\n')
210
210
        open('new', 'wb').write('foo\x00bar\n')
211
211
        pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE,