Rev 4527: (jml) Merge in 1.17 branch, updating version numbers and NEWS file. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4527 [merge]
revision-id: pqm at pqm.ubuntu.com-20090713032104-uxn1ugfiwjfyhwae
parent: pqm at pqm.ubuntu.com-20090710140021-2kq4yhui3de6mwt7
parent: jml at canonical.com-20090713022036-dbfgyuwbau864qsi
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-07-13 04:21:04 +0100
message:
  (jml) Merge in 1.17 branch, updating version numbers and NEWS file.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS	2009-07-09 01:44:00 +0000
+++ b/NEWS	2009-07-13 02:20:36 +0000
@@ -6,12 +6,48 @@
 .. contents:: List of Releases
    :depth: 1
 
+
 In Development
 ##############
 
 Compatibility Breaks
 ********************
 
+New Features
+************
+
+Bug Fixes
+*********
+
+Internals
+*********
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+
+bzr 1.17rc1 "So late it's brunch" 2009-07-13
+############################################
+
+Bazaar continues to blaze a straight and shining path to the 2.0 release and
+the elevation of the ``2a`` beta format to the full glory of "supported and
+stable".
+
+Highlights in this release include greatly reduced memory consumption during
+commits, faster ``ls``, faster ``annotate``, faster network operations if
+you're specifying a revision number and the final destruction of those
+annoying progress bar artifacts.
+
+
+Compatibility Breaks
+********************
+
 * ``bzr register-branch`` from the Launchpad plugin now refers to "project"
   instead of "product" which is the correct Launchpad terminology.  The
   --product option is deprecated and users should switch to using --project.

=== modified file 'bzr'
--- a/bzr	2009-07-04 15:59:58 +0000
+++ b/bzr	2009-07-13 02:20:36 +0000
@@ -23,7 +23,7 @@
 import warnings
 
 # update this on each release
-_script_version = (1, 17, 0)
+_script_version = (1, 18, 0)
 
 if __doc__ is None:
     print "bzr does not support python -OO."

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