~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: John Arbash Meinel
  • Date: 2009-10-14 20:02:28 UTC
  • mfrom: (4634.52.19 2.0.1)
  • mto: (4734.3.1 2.1.0b1)
  • mto: This revision was merged to the branch mainline in revision 4747.
  • Revision ID: john@arbash-meinel.com-20091014200228-fpgssl16h6fmkqww
Merge in the bzr 2.0.1 branch, and resolve a bunch of issues with NEWS.

This also brings in the bug fixes, etc from 2.0.1 that were landed in bzr.dev
after the cut point for 2.1.0b1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1097
1097
 
1098
1098
    # Is this a final release version? If so, we should suppress warnings
1099
1099
    if bzrlib.version_info[3] == 'final':
1100
 
        suppress_deprecation_warnings(override=False)
 
1100
        suppress_deprecation_warnings(override=True)
1101
1101
    if argv is None:
1102
1102
        argv = osutils.get_unicode_argv()
1103
1103
    else: