Mercurial > public > mercurial-scm > hg-stable

diff tests/test-rename-merge1.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 e9ae770eff1c
children a6fe1b9cc68f
line wrap: on
line diff
--- a/tests/test-rename-merge1.t	Wed Jul 04 17:29:49 2012 +0200
+++ b/tests/test-rename-merge1.t	Wed Jul 11 15:03:10 2012 -0700
@@ -68,9 +68,9 @@
   $ hg ci -m "merge"
 
   $ hg debugindex b
-     rev    offset  length   base linkrev nodeid       p1           p2
-       0         0      67      0       1 57eacc201a7f 000000000000 000000000000
-       1        67      72      1       3 4727ba907962 000000000000 57eacc201a7f
+     rev    offset  length  ..... linkrev nodeid       p1           p2 (re)
+       0         0      67  .....       1 57eacc201a7f 000000000000 000000000000 (re)
+       1        67      72  .....       3 4727ba907962 000000000000 57eacc201a7f (re)
 
   $ hg debugrename b
   b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66