Rev 3608: (mbp) start 1.7 in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3608
revision-id: pqm at pqm.ubuntu.com-20080806085554-9e0l5crd6yv0kxy8
parent: pqm at pqm.ubuntu.com-20080806073717-dz0d9gglgf8r9996
parent: mbp at sourcefrog.net-20080806082343-6nh1t7rjjpk5dyps
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-08-06 09:55:54 +0100
message:
  (mbp) start 1.7
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 3607.1.1
    revision-id: mbp at sourcefrog.net-20080806082343-6nh1t7rjjpk5dyps
    parent: pqm at pqm.ubuntu.com-20080806073717-dz0d9gglgf8r9996
    parent: pqm at pqm.ubuntu.com-20080806081305-xvxw50wzvr47315q
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: integration
    timestamp: Wed 2008-08-06 18:23:43 +1000
    message:
      merge back 1.6 and start 1.7
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzr                            bzr.py-20050313053754-5485f144c7006fa6
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 3606.2.1
    revision-id: pqm at pqm.ubuntu.com-20080806081305-xvxw50wzvr47315q
    parent: pqm at pqm.ubuntu.com-20080805202941-gdv30kq4cign8fs4
    parent: mbp at sourcefrog.net-20080806073930-d12u94cx6d0w0ctt
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: 1.6
    timestamp: Wed 2008-08-06 09:13:05 +0100
    message:
      (mbp) prepare 1.6rc1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 3606.1.2
    revision-id: mbp at sourcefrog.net-20080806073930-d12u94cx6d0w0ctt
    parent: mbp at sourcefrog.net-20080806070209-08j1bpnnjxqydi09
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: prepare-1.6
    timestamp: Wed 2008-08-06 17:39:30 +1000
    message:
      Prepare 1.6rc1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS	2008-08-06 07:02:09 +0000
+++ b/NEWS	2008-08-06 08:23:43 +0000
@@ -4,20 +4,35 @@
 
 .. contents::
 
-
 IN DEVELOPMENT
 --------------
 
   CHANGES:
 
+  IMPROVEMENTS:
+
+  BUG FIXES:
+
+  API CHANGES:
+
+  INTERNALS:
+
+
+bzr 1.6rc1 2008-08-06
+---------------------
+
+This release candidate for bzr 1.6 solidifies the new branch stacking
+feature.  Bazaar now recommends that users upgrade all knit repositories,
+because later formats are much faster.  However, we plan to continue read/write and
+upgrade support for knit repostories for the forseeable future.  Several
+other bugs and performance issues were fixed.
+
+  CHANGES:
+
     * Knit format repositories are deprecated and bzr will now emit
       warnings whenever it encounters one.  Use ``bzr upgrade`` to upgrade
       knit repositories to pack format.  (Andrew Bennetts)
       
-
-  FEATURES:
-
-
   IMPROVEMENTS:
 
     * ``bzr check`` can now be told which elements at a location it should
@@ -83,12 +98,6 @@
     * Handle a file turning in to a directory in TreeTransform.
       (James Westby, #248448)
 
-  DOCUMENTATION:
-
-
-  TESTING:
-
-
   API CHANGES:
 
     * ``MutableTree.commit`` has an extra optional keywork parameter
@@ -118,7 +127,6 @@
       file when locked. And during probe, locking the repo isn't very
       useful. (John Arbash Meinel)
 
-
   INTERNALS:
 
     * ``bzrlib.branchbuilder.BranchBuilder`` is now much more capable of

=== modified file 'bzr'
--- a/bzr	2008-07-03 10:44:34 +0000
+++ b/bzr	2008-08-06 08:23:43 +0000
@@ -22,7 +22,7 @@
 import sys
 
 # update this on each release
-_script_version = (1, 6, 0)
+_script_version = (1, 7, 0)
 
 if __doc__ is None:
     print "bzr does not support python -OO."

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2008-08-04 22:41:18 +0000
+++ b/bzrlib/__init__.py	2008-08-06 08:23:43 +0000
@@ -41,7 +41,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, 6, 0, 'beta', 4)
+version_info = (1, 7, 0, 'dev', 0)
 
 
 # API compatibility version: bzrlib is currently API compatible with 1.6.