diff tests/test-mq-qfold.t @ 30431:8c0c75aa3ff4

bdiff: give slight preference to longest matches in the middle of the B side We already have a slight preference for matches close to the middle on the A side. Now, do the same on the B side. j is iterating the b range backwards and we thus accept a new j if the previous match was in the upper half. This makes the test-bhalf diff "correct". It obviously also gives more preference to balanced recursion than to appending to sequences. That is kind of correct, but will also unfortunately make some bundles bigger. No doubt, we can also create examples where it will make them smaller ... The bundle size for 4.0 (hg bundle --base null -r 4.0 x.hg) happens to go from 22803824 to 22806817 bytes - an 0.01% increase.
author Mads Kiilerich <madski@unity3d.com>
date Tue, 08 Nov 2016 18:37:33 +0100
parents 4414d500604f
children 3633403888ae
line wrap: on
line diff
--- a/tests/test-mq-qfold.t	Tue Nov 08 18:37:33 2016 +0100
+++ b/tests/test-mq-qfold.t	Tue Nov 08 18:37:33 2016 +0100
@@ -51,8 +51,8 @@
   --- a/a
   +++ b/a
   @@ -1,1 +1,3 @@
+  +a
    a
-  +a
   +b
 
 Fold with local changes:
@@ -67,8 +67,8 @@
   --- a/a
   +++ b/a
   @@ -1,1 +1,3 @@
+  +a
    a
-  +a
   +b
 
   $ hg revert -a --no-backup