Rev 4597: (mbp) merge back 1.18 and set version to 2.0dev in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4597 [merge]
revision-id: pqm at pqm.ubuntu.com-20090811040617-g99p5v2wsn13ww8z
parent: pqm at pqm.ubuntu.com-20090810111144-cnc5w7p0nsemd76s
parent: mbp at sourcefrog.net-20090811030256-z3dgp44xw21asi72
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-08-11 05:06:17 +0100
message:
  (mbp) merge back 1.18 and set version to 2.0dev
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS	2009-08-10 08:26:42 +0000
+++ b/NEWS	2009-08-11 02:58:23 +0000
@@ -9,18 +9,51 @@
 In Development
 ##############
 
+Compatibility Breaks
+********************
+
+New Features
+************
+
 Bug Fixes
 *********
 
 * Further tweaks to handling of ``bzr add`` messages about ignored files.
   (Jason Spashett, #76616)
 
-
-In Development
-##############
-
-Compatibility Breaks
-********************
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
+bzr 1.18
+########
+
+:Codename: little traveller
+:1.18rc1: 2009-08-10
+
+This release of Bazaar marches on towards the 2.0 release in which the 2a
+'brisbane-core' format becomes generally recommended.  Most of the work in
+this release now focusses on bug fixes and stabilization, covering both 2a
+and previous formats.  There is a new text-mode interactive merge feature,
+a new guide to migration to 2a format in the user documentation, and
+pushing branches to a smart server is now much faster.  
+
+The Bazaar team decided that 2.0 will be a long-term supported release,
+with bugfix-only releases based on it continuing for at least six months
+or until the following stable release.
+
 
 New Features
 ************
@@ -948,7 +981,7 @@
   (Vincent Ladeuil, Robert Collins)
 
 bzr 1.14
-###########
+########
 :Codename: brisbane-core
 :1.14rc1: 2009-04-06
 :1.14rc2: 2009-04-19

=== modified file 'bzr'
--- a/bzr	2009-07-30 23:54:26 +0000
+++ b/bzr	2009-08-11 03:02:56 +0000
@@ -23,7 +23,7 @@
 import warnings
 
 # update this on each release
-_script_version = (1, 18, 0)
+_script_version = (2, 0, 0)
 
 if __doc__ is None:
     print "bzr does not support python -OO."

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2009-07-20 11:27:05 +0000
+++ b/bzrlib/__init__.py	2009-08-11 03:02:56 +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, 18, 0, 'dev', 0)
+version_info = (2, 0, 0, 'dev', 0)
 
 # API compatibility version: bzrlib is currently API compatible with 1.15.
 api_minimum_version = (1, 17, 0)