/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: Jelmer Vernooij
  • Date: 2011-01-19 18:40:15 UTC
  • mfrom: (5622 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5624.
  • Revision ID: jelmer@samba.org-20110119184015-ahycpz0yduideif0
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
389
389
        # subprocess.py that we had to workaround).
390
390
        # However, if 'diff' may not be available
391
391
        self.make_example_branch()
392
 
        # this will be automatically restored by the base bzr test class
393
 
        os.environ['BZR_PROGRESS_BAR'] = 'none'
 
392
        self.overrideEnv('BZR_PROGRESS_BAR', 'none')
394
393
        out, err = self.run_bzr_subprocess('diff -r 1 --diff-options -ub',
395
394
                                           universal_newlines=True,
396
395
                                           retcode=None)