Rev 2698: Switch bzr.dev to 0.91 development in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 2698
revision-id: pqm at pqm.ubuntu.com-20070814221506-6rw0b0oolfdeqrdw
parent: pqm at pqm.ubuntu.com-20070813221757-bianevqddds8ift5
parent: john at arbash-meinel.com-20070814192956-34h336i5q3m34ods
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-08-14 23:15:06 +0100
message:
  Switch bzr.dev to 0.91 development
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
  doc/tutorial.txt               tutorial.txt-20050804190939-9dcbba2ef053bc84
    ------------------------------------------------------------
    revno: 2697.1.1
    merged: john at arbash-meinel.com-20070814192956-34h336i5q3m34ods
    parent: pqm at pqm.ubuntu.com-20070813221757-bianevqddds8ift5
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2007-08-14 14:29:56 -0500
    message:
      Switch bzr.dev to 0.91 development
=== modified file 'NEWS'
--- a/NEWS	2007-08-10 16:19:55 +0000
+++ b/NEWS	2007-08-14 19:29:56 +0000
@@ -1,4 +1,8 @@
-IN DEVELOPMENT
+bzr 0.90rc1 2007-08-14
+
+  BUGFIXES:
+
+bzr 0.90rc1 2007-08-14
 
   BUGFIXES:
 

=== modified file 'bzr'
--- a/bzr	2007-08-09 03:23:04 +0000
+++ b/bzr	2007-08-14 19:29:56 +0000
@@ -88,7 +88,7 @@
 import bzrlib.commands
 import bzrlib.trace
 
-if bzrlib.version_info[:3] != (0, 90, 0):
+if bzrlib.version_info[:3] != (0, 91, 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-08-09 03:23:04 +0000
+++ b/bzrlib/__init__.py	2007-08-14 19:29:56 +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, 90, 0, 'dev', 0)
+version_info = (0, 91, 0, 'dev', 0)
 
 # API compatibility version: bzrlib is currently API compatible with 0.18.
 api_minimum_version = (0, 18, 0)

=== modified file 'bzrlib/symbol_versioning.py'
--- a/bzrlib/symbol_versioning.py	2007-08-09 03:39:31 +0000
+++ b/bzrlib/symbol_versioning.py	2007-08-14 19:29:56 +0000
@@ -38,6 +38,7 @@
            'zero_seventeen',
            'zero_eighteen',
            'zero_ninety',
+           'zero_ninetyone',
            ]
 
 from warnings import warn
@@ -57,6 +58,7 @@
 zero_seventeen = "%s was deprecated in version 0.17."
 zero_eighteen = "%s was deprecated in version 0.18."
 zero_ninety = "%s was deprecated in version 0.90."
+zero_ninetyone = "%s was deprecated in version 0.91."
 
 
 def set_warning_method(method):

=== modified file 'doc/tutorial.txt'
--- a/doc/tutorial.txt	2007-06-07 12:55:47 +0000
+++ b/doc/tutorial.txt	2007-08-14 19:29:56 +0000
@@ -11,7 +11,7 @@
 Bazaar Tutorial
 ===============
 
-Current for bzr-0.16, 2007-05
+Current for bzr-0.91, 2007-08
 
 
 Introduction