Rev 6166: Merge 2.4 into trunk in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/integration/

------------------------------------------------------------
revno: 6166 [merge]
revision-id: v.ladeuil+lp at free.fr-20110926095343-1orcnerhzd2f4y6p
parent: pqm at pqm.ubuntu.com-20110924135325-dvnuwfdu310dc3dq
parent: pqm at pqm.ubuntu.com-20110926094115-btbayi5iciar02m5
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Mon 2011-09-26 11:53:43 +0200
message:
  Merge 2.4 into trunk
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
-------------- next part --------------
=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-09-13 12:29:22 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-09-26 09:53:43 +0000
@@ -26,6 +26,9 @@
 .. Improvements to existing commands, especially improved performance 
    or memory usage, or better results.
 
+* Fixed a bug where ``bzr tags -r x..y`` loaded the branch history once for
+  every revision in the range; it's now much faster. (Vincent Ladeuil, #857335)
+
 Bug Fixes
 *********
 

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2011-09-23 14:15:36 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2011-09-26 09:53:43 +0000
@@ -26,8 +26,8 @@
 .. Improvements to existing commands, especially improved performance 
    or memory usage, or better results.
 
-* Stop reloading all ancestry for each tag when searching tags in a revision
-  range. (Vincent Ladeuil, #857335)
+* Fixed a bug where ``bzr tags -r x..y`` loaded the branch history once for
+  every revision in the range; it's now much faster. (Vincent Ladeuil, #857335)
 
 Bug Fixes
 *********