~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_revno.py

  • Committer: Jelmer Vernooij
  • Date: 2011-10-08 11:42:32 UTC
  • mto: This revision was merged to the branch mainline in revision 6204.
  • Revision ID: jelmer@samba.org-20111008114232-zry9xt2ldfs3nu6p
Add check for using --tree and --revision together.

Show diffs side-by-side

added added

removed removed

Lines of Context:
128
128
 
129
129
        out, err = self.run_bzr('revno -rrevid:%s .' % revid1)
130
130
        self.assertEqual('1\n', out)
 
131
 
 
132
    def test_revno_and_tree_mutually_exclusive(self):
 
133
        wt = self.make_branch_and_tree('.')
 
134
        out, err = self.run_bzr('revno -r-2 --tree .', retcode=3)
 
135
        self.assertEqual('', out)
 
136
        self.assertEqual(
 
137
            'bzr: ERROR: --tree and --revision can not be used together\n',
 
138
            err)