← 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: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
202
202
 
203
203
    def test_diff_branches(self):
204
204
        self.example_branches()
205
 
        # should open branch1 and diff against branch2, 
 
205
        # should open branch1 and diff against branch2,
206
206
        self.check_b2_vs_b1('diff -r branch:branch2 branch1')
207
207
        # Compare two working trees using various syntax forms
208
208
        self.check_b2_vs_b1('diff --old branch2 --new branch1')
371
371
                del os.environ['BZR_PROGRESS_BAR']
372
372
            else:
373
373
                os.environ['BZR_PROGRESS_BAR'] = orig_progress
374
 
            
 
374
 
375
375
        if 'Diff is not installed on this machine' in err:
376
376
            raise TestSkipped("No external 'diff' is available")
377
377
        self.assertEqual('', err)