Rev 5787: release-notes (aka NEWS) about fixing bug #759091 in http://bazaar.launchpad.net/~jameinel/bzr/2.4-merge-faster-759091

John Arbash Meinel john at arbash-meinel.com
Thu Apr 14 17:34:25 UTC 2011


At http://bazaar.launchpad.net/~jameinel/bzr/2.4-merge-faster-759091

------------------------------------------------------------
revno: 5787
revision-id: john at arbash-meinel.com-20110414173417-uxru2rlsj8mb6xu2
parent: john at arbash-meinel.com-20110414172913-gjqy6upjx4az2grq
fixes bug(s): https://launchpad.net/bugs/759091
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.4-merge-faster-759091
timestamp: Thu 2011-04-14 19:34:17 +0200
message:
  release-notes (aka NEWS) about fixing bug #759091
-------------- next part --------------
=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-04-11 09:56:15 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-04-14 17:34:17 +0000
@@ -26,11 +26,9 @@
 .. Improvements to existing commands, especially improved performance 
    or memory usage, or better results.
 
-* When building a new WorkingTree (such as during ``bzr co`` or
-  ``bzr branch``) we now properly store the stat and hash of files that
-  are old enough. This saves a fair amount of time on the first
-  ``bzr status`` (on a 500MB tree, it saves about 30+s).
-  (John Arbash Meinel, #740932)
+* ``bzr merge`` in large trees is now significantly faster. On a 70k entry
+  tree, the time went from ~3min down to 30s.
+  (John Arbash Meinel, #759091)
 
 * Resolve ``lp:FOO`` urls locally rather than doing an XMLRPC request if
   the user has done ``bzr launchpad-login``. The bzr+ssh URLs were already
@@ -42,6 +40,13 @@
   call as much as 2s from Sydney. You can test the local logic by using
   ``-Dlaunchpad``.  (John Arbash Meinel, #397739)
 
+* When building a new WorkingTree (such as during ``bzr co`` or
+  ``bzr branch``) we now properly store the stat and hash of files that
+  are old enough. This saves a fair amount of time on the first
+  ``bzr status`` (on a 500MB tree, it saves about 30+s).
+  (John Arbash Meinel, #740932)
+
+
 Bug Fixes
 *********
 
@@ -58,6 +63,15 @@
 
 * Lazy hooks are now reset between test runs. (Jelmer Vernooij, #745566)
 
+* ``bzrlib.merge.Merge`` now calls ``iter_changes`` without
+  ``include_unversioned=True``. This makes it significantly faster in many
+  cases, because it only looks at modified files, rather than building
+  information about all files. This can cause failures in other
+  TreeTransform code, because it had been expecting to know the names of
+  things which had not changed (such as parent directories). All cases we
+  know about so far have been fixed, but there may be fallout for edge
+  cases that we are missing. (John Arbash Meinel, #759091)
+
 * Standalone bzr.exe installation on Windows: user can put additional python 
   libraries into ``site-packages`` subdirectory of the installation directory,
   this might be required for "installing" extra dependencies for some plugins.



More information about the bazaar-commits mailing list