← 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

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
79
79
 
80
80
''')
81
81
 
 
82
    def test_diff_illegal_prefix_value(self):
 
83
        # There was an error in error reporting for this option
 
84
        out, err = self.runbzr('diff --prefix old/', retcode=3)
 
85
        self.assertContainsRe(err,
 
86
            '--prefix expects two values separated by a colon')
 
87
 
82
88
    def test_diff_p1(self):
83
89
        """diff -p1 produces lkml-style diffs"""
84
90
        self.make_example_branch()