Mercurial > hg

changeset 32304:37bcb4665529

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix up recent conditionalized output changes It looks like (!) can have surprising results matching back to the original output when adjacent lines change, probably because it uses the same code matching that allows (?) to skip missing output. 24f55686a63d ended up adding unconditionalized check*{exec,link} lines, duplicating the conditionalized lines. A Windows run wanted to delete the unconditionalized lines. This now runs on both Windows and Linux.
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 13 May 2017 21:30:02 -0400
parents dc131b9772f2
children 911057981ba4
files tests/test-hardlinks.t tests/test-tags.t
diffstat 2 files changed, 6 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-hardlinks.t	Tue May 16 14:42:13 2017 -0700
+++ b/tests/test-hardlinks.t	Sat May 13 21:30:02 2017 -0400
@@ -225,14 +225,11 @@
   $ nlinksdir r4
   2 r4/.hg/00changelog.i
   2 r4/.hg/branch
+  2 r4/.hg/cache/branch2-base
+  2 r4/.hg/cache/branch2-served
   2 r4/.hg/cache/checkisexec (execbit !)
   ? r4/.hg/cache/checklink-target (glob) (symlink !)
   2 r4/.hg/cache/checknoexec (execbit !)
-  2 r4/.hg/cache/branch2-base
-  2 r4/.hg/cache/branch2-served
-  2 r4/.hg/cache/checkisexec
-  2 r4/.hg/cache/checklink-target
-  2 r4/.hg/cache/checknoexec
   2 r4/.hg/cache/rbc-names-v1
   2 r4/.hg/cache/rbc-revs-v1
   2 r4/.hg/dirstate
@@ -274,14 +271,11 @@
   $ nlinksdir r4
   2 r4/.hg/00changelog.i
   1 r4/.hg/branch
+  2 r4/.hg/cache/branch2-base
+  2 r4/.hg/cache/branch2-served
   2 r4/.hg/cache/checkisexec (execbit !)
   2 r4/.hg/cache/checklink-target (symlink !)
   2 r4/.hg/cache/checknoexec (execbit !)
-  2 r4/.hg/cache/branch2-base
-  2 r4/.hg/cache/branch2-served
-  2 r4/.hg/cache/checkisexec
-  2 r4/.hg/cache/checklink-target
-  2 r4/.hg/cache/checknoexec
   2 r4/.hg/cache/rbc-names-v1
   2 r4/.hg/cache/rbc-revs-v1
   1 r4/.hg/dirstate
--- a/tests/test-tags.t	Tue May 16 14:42:13 2017 -0700
+++ b/tests/test-tags.t	Sat May 13 21:30:02 2017 -0400
@@ -671,13 +671,10 @@
 Missing tags2* files means the cache wasn't written through the normal mechanism.
 
   $ ls tagsclient/.hg/cache
+  branch2-base
   checkisexec (execbit !)
   checklink (symlink !)
   checklink-target (symlink !)
-  branch2-base
-  checkisexec
-  checklink
-  checklink-target
   hgtagsfnodes1
 
 Cache should contain the head only, even though other nodes have tags data
@@ -699,13 +696,10 @@
   0.1                                0:96ee1d7354c4
 
   $ ls tagsclient/.hg/cache
+  branch2-base
   checkisexec (execbit !)
   checklink (symlink !)
   checklink-target (symlink !)
-  branch2-base
-  checkisexec
-  checklink
-  checklink-target
   hgtagsfnodes1
   tags2-visible