← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-02-13 03:19:02 UTC
  • mfrom: (3221.1.8 prepare-1.2rc1)
  • Revision ID: pqm@pqm.ubuntu.com-20080213031902-4xhmwps49vclfhh6
Tweaked fix for #187169: if an illegal update is made to the dirstate, don't allow it to be written out.

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(