← 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

first cut at merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
23
23
 
24
24
import bzrlib
25
25
from bzrlib.branch import Branch
26
 
from bzrlib.clone import copy_branch
27
26
from bzrlib.tests.blackbox import ExternalBase
28
27
 
29
28
 
93
92
        print >> open('branch1/file1', 'wb'), 'new line'
94
93
        output = self.run_bzr_captured(['diff', '-r', '1..', 'branch1'], retcode=1)
95
94
        self.assertTrue('\n-original line\n+new line\n' in output[0])
96