Rev 2488: Resolve NEWS against 0.16 branch in http://sourcefrog.net/bzr/run-hooks

[Martin Pool]

At http://sourcefrog.net/bzr/run-hooks

------------------------------------------------------------
revno: 2488
revision-id: mbp at sourcefrog.net-20070507122424-floh4b3kgzg5vgo3
parent: mbp at sourcefrog.net-20070507120459-ihx998ls87g6qqon
parent: pqm at pqm.ubuntu.com-20070430073311-say1rwtz3bk8a3rt
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Mon 2007-05-07 22:24:24 +1000
message:
  Resolve NEWS against 0.16 branch
modified:
  README                         README-20050309040720-8f368abf9f346b9d
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 2463.1.2
    merged: pqm at pqm.ubuntu.com-20070430073311-say1rwtz3bk8a3rt
    parent: mbp at sourcefrog.net-20070426105838-f54z8279m88bl6ea
    parent: robertc at robertcollins.net-20070430065822-v91uqhvvn071teqo
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: 0.16
    timestamp: Mon 2007-04-30 08:33:11 +0100
    message:
      (robertc) bzr 0.16rc: incorporate the relatively trivial fixes from bzr.dev.
        ------------------------------------------------------------
        revno: 2463.1.1.1.1
        merged: robertc at robertcollins.net-20070430065822-v91uqhvvn071teqo
        parent: mbp at sourcefrog.net-20070426105838-f54z8279m88bl6ea
        parent: pqm at pqm.ubuntu.com-20070430054416-kl8x12cim7g45lap
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: 0.16
        timestamp: Mon 2007-04-30 16:58:22 +1000
        message:
          Merge incremental improvements from bzr.dev to create bzr 0.16rc2
    ------------------------------------------------------------
    revno: 2463.1.1
    merged: mbp at sourcefrog.net-20070426105838-f54z8279m88bl6ea
    parent: pqm at pqm.ubuntu.com-20070426104148-4l5wq2zemlzv0shg
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: 0.16-release
    timestamp: Thu 2007-04-26 20:58:38 +1000
    message:
      Prepare 0.16rc1
=== modified file 'README'
--- a/README	2007-03-21 04:28:02 +0000
+++ b/README	2007-04-30 06:58:22 +0000
@@ -1,6 +1,6 @@
-=====================================
-README for Bazaar DEVELOPMENT VERSION
-=====================================
+=========================
+README for Bazaar 0.16rc2
+=========================
 
 Bazaar is a decentralized revision control system, designed to be easy
 for developers and end users alike.

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2007-04-01 06:19:16 +0000
+++ b/bzrlib/__init__.py	2007-04-30 06:58:22 +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, 'dev', 0)
+version_info = (0, 16, 0, 'candidate', 2)
 
 if version_info[3] == 'final':
     version_string = '%d.%d.%d' % version_info[:3]