Rev 6022: (vila) Move news entries from 2.4 to 2.5 for patches landed after 2.4 in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 6022 [merge]
revision-id: pqm at pqm.ubuntu.com-20110711101336-k498o31t08szd9e9
parent: pqm at pqm.ubuntu.com-20110711083047-016iinonq1tbgl6b
parent: v.ladeuil+lp at free.fr-20110711085359-54ouecm5rzedzixz
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2011-07-11 10:13:36 +0000
message:
  (vila) Move news entries from 2.4 to 2.5 for patches landed after 2.4
   fork (Vincent Ladeuil)
modified:
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-07-11 02:06:18 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-07-11 08:53:59 +0000
@@ -56,20 +56,6 @@
    suite.  This can include new facilities for writing tests, fixes to 
    spurious test failures and changes to the way things should be tested.
 
-* `BranchBuilder.build_snapshot` now supports a "flush" action.  This
-  cleanly and reliably allows tests using `BranchBuilder` to construct
-  branches that e.g. rename files out of a directory and unversion that
-  directory in the same revision.  Previously some changes were impossible
-  due to the order that `build_snapshot` performs its actions.
-  (Andrew Bennetts)
-
-* `TestCaseWithMemoryTransport` is faster now: `_check_safety_net` now
-  just compares the bytes in the dirstate file to its pristine state,
-  rather than opening the WorkingTree and calling ``last_revision()``.
-  This reduces the overall test suite time by about 10% on my laptop.
-  (Andrew Bennetts)
-
-
 bzr 2.4b5
 #########
 

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2011-07-11 07:49:59 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2011-07-11 08:53:59 +0000
@@ -56,6 +56,18 @@
    suite.  This can include new facilities for writing tests, fixes to 
    spurious test failures and changes to the way things should be tested.
 
+* `BranchBuilder.build_snapshot` now supports a "flush" action.  This
+  cleanly and reliably allows tests using `BranchBuilder` to construct
+  branches that e.g. rename files out of a directory and unversion that
+  directory in the same revision.  Previously some changes were impossible
+  due to the order that `build_snapshot` performs its actions.
+  (Andrew Bennetts)
+
+* `TestCaseWithMemoryTransport` is faster now: `_check_safety_net` now
+  just compares the bytes in the dirstate file to its pristine state,
+  rather than opening the WorkingTree and calling ``last_revision()``.
+  This reduces the overall test suite time by about 10% on my laptop.
+  (Andrew Bennetts)
 
 ..
    vim: tw=74 ft=rst ff=unix