Rev 4678: Merge the 2.0'series section with the 2.0.1 section. in http://bazaar.launchpad.net/~jameinel/bzr/2.0.1-322807-branch-at-root

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.0.1-322807-branch-at-root

------------------------------------------------------------
revno: 4678
revision-id: john at arbash-meinel.com-20091006173334-rghfzhhwi5t0cwiy
parent: pqm at pqm.ubuntu.com-20091006074423-1oqqlgnvz1vshdz7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.0.1-322807-branch-at-root
timestamp: Tue 2009-10-06 12:33:34 -0500
message:
  Merge the 2.0'series section with the 2.0.1 section.
  
  2.0.1 is the next release in the 2.0 series, thus they should be combined.
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-10-06 06:34:18 +0000
+++ b/NEWS	2009-10-06 17:33:34 +0000
@@ -2,8 +2,8 @@
 Bazaar Release Notes
 ####################
 
-2.0 series (not released)
-#########################
+2.0.1 (not released)
+####################
 
 Compatibility Breaks
 ********************
@@ -26,6 +26,15 @@
   with some combinations of remote and local formats.  This was causing
   "unknown object type identifier 60" errors.  (Andrew Bennetts, #427736)
 
+* Improve the time for ``bzr log DIR`` for 2a format repositories.
+  We had been using the same code path as for <2a formats, which required
+  iterating over all objects in all revisions.
+  (John Arbash Meinel, #374730)
+
+* Make sure that we unlock the tree if we fail to create a TreeTransform
+  object when doing a merge, and there is limbo, or pending-deletions
+  directory.  (Gary van der Merwe, #427773)
+
 * Occasional IndexError on renamed files have been fixed. Operations that
   set a full inventory in the working tree will now go via the
   apply_inventory_delta code path which is simpler and easier to
@@ -34,6 +43,9 @@
   but such operations are already doing full tree scans, so no radical
   performance change should be observed. (Robert Collins, #403322)
 
+* Retrieving file text or mtime from a _PreviewTree has good performance when
+  there are many changes.  (Aaron Bentley)
+
 * When a file kind becomes unversionable after being added, a sensible
   error will be shown instead of a traceback. (Robert Collins, #438569)
 
@@ -55,25 +67,6 @@
 Testing
 *******
 
-bzr 2.0.1
-##########
-
-Bug Fixes
-*********
-
-* Improve the time for ``bzr log DIR`` for 2a format repositories.
-  We had been using the same code path as for <2a formats, which required
-  iterating over all objects in all revisions.
-  (John Arbash Meinel, #374730)
-
-* Make sure that we unlock the tree if we fail to create a TreeTransform
-  object when doing a merge, and there is limbo, or pending-deletions
-  directory.  (Gary van der Merwe, #427773)
-
-* Retrieving file text or mtime from a _PreviewTree has good performance when
-  there are many changes.  (Aaron Bentley)
-
-
 bzr 2.0.0
 #########