← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/commands.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/bundle/commands.py
59
59
            bundle_info = read_bundle(bundle_file)
60
60
        else:
61
61
            if verbose:
62
 
                raise errors.BzrCommandError('Verbose requires a merge'
63
 
                                             ' directive')
 
62
                raise errors.BzrCommandError('--verbose requires a merge'
 
63
                    ' directive')
64
64
        reader_method = getattr(bundle_info, 'get_bundle_reader', None)
65
65
        if reader_method is None:
66
66
            raise errors.BzrCommandError('Bundle format not supported')