Rev 4269: (tanner) fix increment of revision in bzrlib/__init__.py and bzr in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4269
revision-id: pqm at pqm.ubuntu.com-20090408093053-bmb2x9h7jeyac5b7
parent: pqm at pqm.ubuntu.com-20090408084231-3wvecksg40vgchzo
parent: tanner at real-time.com-20090408062820-bo2icysc26raok1u
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-04-08 10:30:53 +0100
message:
  (tanner) fix increment of revision in bzrlib/__init__.py and bzr
modified:
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 4267.1.1
    revision-id: tanner at real-time.com-20090408062820-bo2icysc26raok1u
    parent: pqm at pqm.ubuntu.com-20090408062211-qhu50uezgnlj7ked
    committer: Robert J. Tanner <tanner at real-time.com>
    branch nick: bzr.dev
    timestamp: Wed 2009-04-08 01:28:20 -0500
    message:
      Missed incrementing the bzrlib/__init.py__ and bzr _script_version
    modified:
      bzr                            bzr.py-20050313053754-5485f144c7006fa6
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'bzr'
--- a/bzr	2009-03-24 05:12:24 +0000
+++ b/bzr	2009-04-08 06:28:20 +0000
@@ -22,7 +22,7 @@
 import sys
 
 # update this on each release
-_script_version = (1, 14, 0)
+_script_version = (1, 15, 0)
 
 if __doc__ is None:
     print "bzr does not support python -OO."

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2009-04-04 07:07:44 +0000
+++ b/bzrlib/__init__.py	2009-04-08 06:28:20 +0000
@@ -50,7 +50,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 = (1, 14, 0, 'candidate', 1)
+version_info = (1, 15, 0, 'dev', 0)
 
 # API compatibility version: bzrlib is currently API compatible with 1.13.
 api_minimum_version = (1, 13, 0)