Rev 2523: prepare for 0.18 development in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2523
revision-id: pqm at pqm.ubuntu.com-20070612060727-v8nd5etbkay15fm2
parent: pqm at pqm.ubuntu.com-20070612021742-uetsy3g747iq3xkk
parent: ian.clatworthy at internode.on.net-20070612043421-jysoks4ytany6l45
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-12 07:07:27 +0100
message:
  prepare for 0.18 development
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  README                         README-20050309040720-8f368abf9f346b9d
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
    ------------------------------------------------------------
    revno: 2522.1.1
    merged: ian.clatworthy at internode.on.net-20070612043421-jysoks4ytany6l45
    parent: pqm at pqm.ubuntu.com-20070612021742-uetsy3g747iq3xkk
    committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
    branch nick: bzr.dev
    timestamp: Tue 2007-06-12 14:34:21 +1000
    message:
      prepare for 0.18 development
=== modified file 'NEWS'
--- a/NEWS	2007-06-12 01:44:20 +0000
+++ b/NEWS	2007-06-12 04:34:21 +0000
@@ -1,5 +1,7 @@
 IN DEVELOPMENT
 
+bzr 0.17rc1  2007-06-12
+
   NOTES WHEN UPGRADING:
 
     * The kind() and is_executable() APIs on the WorkingTree interface no

=== modified file 'README'
--- a/README	2007-05-08 20:03:44 +0000
+++ b/README	2007-06-12 04:34:21 +0000
@@ -1,5 +1,5 @@
 ==========================
-README for Bazaar 0.17-dev
+README for Bazaar 0.18-dev
 ==========================
 
 Bazaar is a decentralized revision control system, designed to be easy

=== modified file 'bzr'
--- a/bzr	2007-05-08 20:03:44 +0000
+++ b/bzr	2007-06-12 04:34:21 +0000
@@ -88,7 +88,7 @@
 import bzrlib.commands
 import bzrlib.trace
 
-if bzrlib.version_info[:3] != (0, 17, 0):
+if bzrlib.version_info[:3] != (0, 18, 0):
     sys.stderr.write("bzr: WARNING: bzrlib version doesn't match the bzr program.\n"
             "This may indicate an installation problem.\n"
             "bzrlib from %s is version %r\n"

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2007-05-08 20:03:44 +0000
+++ b/bzrlib/__init__.py	2007-06-12 04:34:21 +0000
@@ -35,7 +35,7 @@
 # Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
 # releaselevel of 'dev' for unreleased under-development code.
 
-version_info = (0, 17, 0, 'dev', 0)
+version_info = (0, 18, 0, 'dev', 0)
 
 if version_info[3] == 'final':
     version_string = '%d.%d.%d' % version_info[:3]

=== modified file 'bzrlib/symbol_versioning.py'
--- a/bzrlib/symbol_versioning.py	2007-05-24 11:54:07 +0000
+++ b/bzrlib/symbol_versioning.py	2007-06-12 04:34:21 +0000
@@ -36,6 +36,7 @@
            'zero_fifteen',
            'zero_sixteen',
            'zero_seventeen',
+           'zero_eighteen',
            ]
 
 from warnings import warn
@@ -53,6 +54,7 @@
 zero_fifteen = "%s was deprecated in version 0.15."
 zero_sixteen = "%s was deprecated in version 0.16."
 zero_seventeen = "%s was deprecated in version 0.17."
+zero_eighteen = "%s was deprecated in version 0.18."
 
 
 def set_warning_method(method):