Rev 4684: Merge 2.0.1 back into the 2.0 series, update NEWS and versions. in lp:///~jameinel/bzr/2.0.2

[John Arbash Meinel]

At lp:///~jameinel/bzr/2.0.2

------------------------------------------------------------
revno: 4684 [merge]
revision-id: john at arbash-meinel.com-20091015034714-4c7e3seksf4gzgjd
parent: pqm at pqm.ubuntu.com-20091013220530-lguiz901cqe4c4hu
parent: pqm at pqm.ubuntu.com-20091014220754-g7hvub7b3ofi235e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.0.2
timestamp: Wed 2009-10-14 22:47:14 -0500
message:
  Merge 2.0.1 back into the 2.0 series, update NEWS and versions.
  
  Add a template at the bottom of NEWS that can be used to just copy & paste
  to bump for a new release.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-10-13 22:05:30 +0000
+++ b/NEWS	2009-10-15 03:47:14 +0000
@@ -5,8 +5,11 @@
 .. contents:: List of Releases
    :depth: 1
 
-bzr 2.0.1 (not released)
-########################
+bzr 2.0.2 (not released yet)
+############################
+
+:Codename:
+:2.0.2: ???
 
 Compatibility Breaks
 ********************
@@ -17,6 +20,36 @@
 Bug Fixes
 *********
 
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
+bzr 2.0.1
+#########
+
+:Codename: Stability First
+:2.0.1: 2009-10-14
+
+The first of our new ongoing bugfix-only stable releases has arrived. It
+includes a collection of 12 bugfixes applied to bzr 2.0.0, but does not
+include any of the feature development in the 2.1.0 series.
+
+
+Bug Fixes
+*********
+
 * ``bzr add`` in a tree that has files with ``\r`` or ``\n`` in the
   filename will issue a warning and skip over those files.
   (Robert Collins, #3918)
@@ -69,9 +102,6 @@
 * When a file kind becomes unversionable after being added, a sensible
   error will be shown instead of a traceback. (Robert Collins, #438569)
 
-Improvements
-************
-
 Documentation
 *************
 
@@ -80,14 +110,6 @@
 * Improved upgrade documentation for Launchpad branches.
   (Barry Warsaw)
 
-API Changes
-***********
-
-Internals
-*********
-
-Testing
-*******
 
 bzr 2.0.0
 #########
@@ -10694,5 +10716,38 @@
 * Storage of local versions: init, add, remove, rm, info, log,
   diff, status, etc.
 
+
+bzr ?.?.? (not released yet)
+############################
+
+:Codename: template
+:2.0.2: ???
+
+Compatibility Breaks
+********************
+
+New Features
+************
+
+Bug Fixes
+*********
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
+
 ..
    vim: tw=74 ft=rst ff=unix

=== modified file 'bzr'
--- a/bzr	2009-09-10 06:32:42 +0000
+++ b/bzr	2009-10-15 03:47:14 +0000
@@ -23,7 +23,7 @@
 import warnings
 
 # update this on each release
-_script_version = (2, 0, 0)
+_script_version = (2, 0, 2)
 
 if __doc__ is None:
     print "bzr does not support python -OO."

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2009-09-25 01:41:37 +0000
+++ b/bzrlib/__init__.py	2009-10-15 03:47:14 +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 = (2, 0, 0, 'final', 0)
+version_info = (2, 0, 2, 'dev', 0)
 
 # API compatibility version: bzrlib is currently API compatible with 1.15.
 api_minimum_version = (1, 17, 0)