tests/test-generaldelta.t
branchstable
changeset 51500 f3e9d1df879b
parent 51352 7083b33a2699
child 51501 e5b28637f4ca
--- a/tests/test-generaldelta.t	Mon Mar 11 13:09:01 2024 +0100
+++ b/tests/test-generaldelta.t	Mon Mar 11 11:09:29 2024 +0100
@@ -138,12 +138,12 @@
 
 - Verify non-aggressive merge uses p1 (commit 1) as delta parent
   $ hg merge -q 0
-  $ hg commit -q -m merge
+  $ hg commit -q -m merge --config storage.revlog.optimize-delta-parent-choice=no
   $ hg debugdeltachain -m
       rev      p1      p2  chain# chainlen     prev   delta
         0      -1      -1       1        1       -1    base
         1      -1      -1       1        2        0    prev
-        2       1       0       1        2        0      p2
+        2       1       0       1        3        1      p1
 
   $ hg strip -q -r . --config extensions.strip=