← 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: Canonical.com Patch Queue Manager
  • Date: 2010-07-19 17:42:16 UTC
  • mfrom: (5351.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100719174216-c1mezuulmblmnkp5
(mbp) bug 234708: An error is displayed if both --diff-options and --using
 is set (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
155
155
        self.assertContainsRe(err,
156
156
            "Requested revision: '1.1' does not exist in branch:")
157
157
 
 
158
    def test_diff_diff_options_and_using(self):
 
159
        out, err = self.run_bzr('diff --diff-options -wu --using /usr/bin/diff', retcode=3,
 
160
          error_regexes=('are mutually exclusive.',))
 
161
 
158
162
    def test_diff_unversioned(self):
159
163
        # Get an error when diffing a non-versioned file.
160
164
        # (Malone #3619)
321
325
        output = self.run_bzr('diff --format=boo', retcode=1)
322
326
        self.assertTrue("BOO!" in output[0])
323
327
 
324
 
 
325
328
class TestCheckoutDiff(TestDiff):
326
329
 
327
330
    def make_example_branch(self):