diff tests/test-merge7.t @ 17132:b87acfda5268

tests: reduce spurious failures when run with generaldelta

Quite a few tests fail in noisy but meaningless ways when the test suite
is run with generaldelta enabled:

  ./run-tests.py --extra-config-opt=format.generaldelta=1

This reduces the amount of noise introduced by the debugindex command,
the main source of differences.  In my environment, when testing with
generaldelta enabled, this change reduces the number of completely
failing tests from 21 to 8.

--- a/tests/test-merge7.t	Wed Jul 04 17:29:49 2012 +0200
+++ b/tests/test-merge7.t	Wed Jul 11 15:03:10 2012 -0700
@@ -105,12 +105,12 @@
   three
 
   $ hg debugindex test.txt
-     rev    offset  length   base linkrev nodeid       p1           p2
-       0         0       7      0       0 01365c4cca56 000000000000 000000000000
-       1         7       9      1       1 7b013192566a 01365c4cca56 000000000000
-       2        16      15      2       2 8fe46a3eb557 01365c4cca56 000000000000
-       3        31      27      2       3 fc3148072371 7b013192566a 8fe46a3eb557
-       4        58      25      4       4 d40249267ae3 8fe46a3eb557 000000000000
+     rev    offset  length  ..... linkrev nodeid       p1           p2 (re)
+       0         0       7  .....       0 01365c4cca56 000000000000 000000000000 (re)
+       1         7       9  .....       1 7b013192566a 01365c4cca56 000000000000 (re)
+       2        16      15  .....       2 8fe46a3eb557 01365c4cca56 000000000000 (re)
+       3        31      2.  .....       3 fc3148072371 7b013192566a 8fe46a3eb557 (re)
+       4        5.      25  .....       4 d40249267ae3 8fe46a3eb557 000000000000 (re)
 
   $ hg log
   changeset:   4:40d11a4173a8