Mercurial > public > mercurial-scm > hg

diff tests/test-excessive-merge.t @ 17132:b87acfda5268

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bryan O'Sullivan <bryano@fb.com>
date Wed, 11 Jul 2012 15:03:10 -0700
parents a79fea6b3e77
children b7a966ce89ed
line wrap: on
line diff
--- a/tests/test-excessive-merge.t	Wed Jul 04 17:29:49 2012 +0200
+++ b/tests/test-excessive-merge.t	Wed Jul 11 15:03:10 2012 -0700
@@ -64,12 +64,12 @@
   summary:     test
   
   $ hg debugindex --changelog
-     rev    offset  length   base linkrev nodeid       p1           p2
-       0         0      60      0       0 5e0375449e74 000000000000 000000000000
-       1        60      62      1       1 96155394af80 5e0375449e74 000000000000
-       2       122      62      2       2 92cc4c306b19 5e0375449e74 000000000000
-       3       184      69      3       3 e16a66a37edd 92cc4c306b19 96155394af80
-       4       253      29      3       4 2ee31f665a86 96155394af80 92cc4c306b19
+     rev    offset  length  ..... linkrev nodeid       p1           p2 (re)
+       0         0      60  .....       0 5e0375449e74 000000000000 000000000000 (re)
+       1        60      62  .....       1 96155394af80 5e0375449e74 000000000000 (re)
+       2       122      62  .....       2 92cc4c306b19 5e0375449e74 000000000000 (re)
+       3       184      69  .....       3 e16a66a37edd 92cc4c306b19 96155394af80 (re)
+       4       253      29  .....       4 2ee31f665a86 96155394af80 92cc4c306b19 (re)
 
 revision 1
   $ hg manifest --debug 1
@@ -89,9 +89,9 @@
   79d7492df40aa0fa093ec4209be78043c181f094 644   b
 
   $ hg debugindex a
-     rev    offset  length   base linkrev nodeid       p1           p2
-       0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
-       1         5       6      1       1 79d7492df40a 2ed2a3912a0b 000000000000
+     rev    offset  length  ..... linkrev nodeid       p1           p2 (re)
+       0         0       5  .....       0 2ed2a3912a0b 000000000000 000000000000 (re)
+       1         5       6  .....       1 79d7492df40a 2ed2a3912a0b 000000000000 (re)
 
   $ hg verify
   checking changesets