Rev 2485: Updates for bzr-0.17-dev in http://bzr.arbash-meinel.com/branches/bzr/jam-integration

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/jam-integration

------------------------------------------------------------
revno: 2485
revision-id: john at arbash-meinel.com-20070508200344-p77ycd72josdljry
parent: john at arbash-meinel.com-20070508200050-4imwmtzep8fx5v7w
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2007-05-08 15:03:44 -0500
message:
  Updates for bzr-0.17-dev
modified:
  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
-------------- next part --------------
=== modified file 'README'
--- a/README	2007-04-30 06:58:22 +0000
+++ b/README	2007-05-08 20:03:44 +0000
@@ -1,6 +1,6 @@
-=========================
-README for Bazaar 0.16rc2
-=========================
+==========================
+README for Bazaar 0.17-dev
+==========================
 
 Bazaar is a decentralized revision control system, designed to be easy
 for developers and end users alike.

=== modified file 'bzr'
--- a/bzr	2007-05-03 16:42:30 +0000
+++ b/bzr	2007-05-08 20:03:44 +0000
@@ -88,7 +88,7 @@
 import bzrlib.commands
 import bzrlib.trace
 
-if bzrlib.version_info[:3] != (0, 16, 0):
+if bzrlib.version_info[:3] != (0, 17, 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-07 13:10:58 +0000
+++ b/bzrlib/__init__.py	2007-05-08 20:03:44 +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, 16, 0, 'final', 0)
+version_info = (0, 17, 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-04-01 06:19:16 +0000
+++ b/bzrlib/symbol_versioning.py	2007-05-08 20:03:44 +0000
@@ -35,6 +35,7 @@
            'zero_fourteen',
            'zero_fifteen',
            'zero_sixteen',
+           'zero_seventeen',
            ]
 
 from warnings import warn
@@ -51,6 +52,7 @@
 zero_fourteen = "%s was deprecated in version 0.14."
 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."
 
 
 def set_warning_method(method):