← Back to branch summary

~lifeless/bzr/index.range_map

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2008-06-19 01:17:19 UTC
  • mfrom: (3218.1.277 +trunk)
  • Revision ID: robertc@robertcollins.net-20080619011719-1c4g4uxzzhdls2wf
Merge 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(