/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_bundle_info.py

  • Committer: Aaron Bentley
  • Date: 2008-02-24 16:42:13 UTC
  • mfrom: (3234 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3235.
  • Revision ID: aaron@aaronbentley.com-20080224164213-eza1lzru5bwuwmmj
Merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_bundle_info.py
38
38
        self.assertContainsRe(info, 'file: 1 .0 multiparent.')
39
39
        self.assertContainsRe(info, 'nicks: source')
40
40
        self.assertNotContainsRe(info, 'foo')
41
 
        self.run_bzr_error(['Verbose requires a merge directive'],
 
41
        self.run_bzr_error(['--verbose requires a merge directive'],
42
42
                           'bundle-info -v bundle')
43
43
        target = self.make_branch('target')
44
44
        md = merge_directive.MergeDirective2.from_objects(