Skip to content
Snippets Groups Projects
Commit 37bcb466 authored by Matt Harbison's avatar Matt Harbison
Browse files

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.
parent dc131b97
No related branches found
No related tags found
No related merge requests found
......@@ -225,6 +225,8 @@
$ 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 !)
......@@ -228,11 +230,6 @@
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,6 +271,8 @@
$ 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 !)
......@@ -277,11 +276,6 @@
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
......
......@@ -671,6 +671,7 @@
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 !)
......@@ -674,10 +675,6 @@
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,6 +696,7 @@
0.1 0:96ee1d7354c4
$ ls tagsclient/.hg/cache
branch2-base
checkisexec (execbit !)
checklink (symlink !)
checklink-target (symlink !)
......@@ -702,10 +700,6 @@
checkisexec (execbit !)
checklink (symlink !)
checklink-target (symlink !)
branch2-base
checkisexec
checklink
checklink-target
hgtagsfnodes1
tags2-visible
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment