← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

  • Committer: Aaron Bentley
  • Date: 2005-11-11 17:46:11 UTC
  • mto: (1185.65.2 bzr.revision-storage)
  • mto: This revision was merged to the branch mainline in revision 1509.
  • Revision ID: aaron.bentley@utoronto.ca-20051111174611-05c622f83aca3d78
Support whitespace in diff filenames

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
337
337
                                        'branch1'],
338
338
                                       retcode=1)
339
339
        self.assertEquals(("=== modified file 'file'\n"
340
 
                           "--- file\n"
341
 
                           "+++ file\n"
 
340
                           "--- file\t\n"
 
341
                           "+++ file\t\n"
342
342
                           "@@ -1,1 +1,1 @@\n"
343
343
                           "-new content\n"
344
344
                           "+contents of branch1/file\n"
346
346
        output = self.run_bzr_captured(['diff', 'branch2', 'branch1'],
347
347
                                       retcode=1)
348
348
        self.assertEqualDiff(("=== modified file 'file'\n"
349
 
                              "--- file\n"
350
 
                              "+++ file\n"
 
349
                              "--- file\t\n"
 
350
                              "+++ file\t\n"
351
351
                              "@@ -1,1 +1,1 @@\n"
352
352
                              "-new content\n"
353
353
                              "+contents of branch1/file\n"