← 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: Alexander Belchenko
  • Date: 2008-02-16 10:03:17 UTC
  • mfrom: (3224 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3230.
  • Revision ID: bialix@ukr.net-20080216100317-xg1hdw306evlgt94
merge bzr.dev; update for 1.3; $BZR_LOG used in trace.py module (again), not in the main bzr script (req. by Robert Collins)

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(