Rev 4712: Bring in bzr/2.0 to get the NEWS updates. in http://bazaar.launchpad.net/~jameinel/bzr/2.0.4-faster-export-343218

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.0.4-faster-export-343218

------------------------------------------------------------
revno: 4712 [merge]
revision-id: john at arbash-meinel.com-20091215220254-3qadzt95oewkogcp
parent: john at arbash-meinel.com-20091215172040-46v20oub01qly6e0
parent: pqm at pqm.ubuntu.com-20091215185122-u7np9em9l26jvfgj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.0.4-faster-export-343218
timestamp: Tue 2009-12-15 16:02:54 -0600
message:
  Bring in bzr/2.0 to get the NEWS updates.
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-12-14 20:17:50 +0000
+++ b/NEWS	2009-12-15 16:56:18 +0000
@@ -5,6 +5,37 @@
 .. contents:: List of Releases
    :depth: 1
 
+bzr 2.0.4 (not released yet)
+############################
+
+:Codename: template
+:2.0.4: ???
+
+Compatibility Breaks
+********************
+
+New Features
+************
+
+Bug Fixes
+*********
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
 bzr 2.0.3
 #########
 

=== modified file 'bzr'
--- a/bzr	2009-10-30 15:58:10 +0000
+++ b/bzr	2009-12-15 16:56:18 +0000
@@ -23,7 +23,7 @@
 import warnings
 
 # update this on each release
-_script_version = (2, 0, 3)
+_script_version = (2, 0, 4)
 
 if __doc__ is None:
     print "bzr does not support python -OO."

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2009-12-14 20:17:50 +0000
+++ b/bzrlib/__init__.py	2009-12-15 16:56:18 +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, 3, 'final', 0)
+version_info = (2, 0, 4, 'dev', 0)
 
 # API compatibility version: bzrlib is currently API compatible with 1.15.
 api_minimum_version = (1, 17, 0)