# HG changeset patch # User Matt Harbison # Date 1483901393 18000 # Node ID d4ec69ff652ab70226022cdf4279bdbf124bbaab # Parent b8a188a6f1914c98df8b9c9f93168aa6c7b08270 tests: update globs for Windows The extra glob in test-command-template.t caused it to say no result was reported. It used to be (within the past year), that both this and the missing glob cases could be fixed simply by editing any output in the test, and re-running it in interactive mode. But that no longer works, and I had to diff *.t against *.t.err. I didn't dig into what changed. diff -r b8a188a6f191 -r d4ec69ff652a tests/test-command-template.t --- a/tests/test-command-template.t Sun Jan 08 12:05:10 2017 -0500 +++ b/tests/test-command-template.t Sun Jan 08 13:49:53 2017 -0500 @@ -3707,7 +3707,7 @@ a $ cd .. $ hg log -R r -r0 -T '{files % "{file|relpath}\n"}' - r/a (glob) + r/a $ cd r Test active bookmark templating diff -r b8a188a6f191 -r d4ec69ff652a tests/test-convert-git.t --- a/tests/test-convert-git.t Sun Jan 08 12:05:10 2017 -0500 +++ b/tests/test-convert-git.t Sun Jan 08 13:49:53 2017 -0500 @@ -750,7 +750,7 @@ $ COMMIT_OBJ=1c/0ce3c5886f83a1d78a7b517cdff5cf9ca17bdd $ mv git-repo4/.git/objects/$COMMIT_OBJ git-repo4/.git/objects/$COMMIT_OBJ.tmp $ hg convert git-repo4 git-repo4-broken-hg 2>&1 | grep 'abort:' - abort: cannot retrieve number of commits in $TESTTMP/git-repo4/.git + abort: cannot retrieve number of commits in $TESTTMP/git-repo4/.git (glob) $ mv git-repo4/.git/objects/$COMMIT_OBJ.tmp git-repo4/.git/objects/$COMMIT_OBJ damage git repository by renaming a blob object diff -r b8a188a6f191 -r d4ec69ff652a tests/test-subrepo.t --- a/tests/test-subrepo.t Sun Jan 08 12:05:10 2017 -0500 +++ b/tests/test-subrepo.t Sun Jan 08 13:49:53 2017 -0500 @@ -58,10 +58,10 @@ $ mkdir snot $ touch snot/file $ hg remove -S snot/file - not removing snot/file: file is untracked + not removing snot/file: file is untracked (glob) [1] $ hg cat snot/filenot - snot/filenot: no such file in rev 7cf8cfea66e4 + snot/filenot: no such file in rev 7cf8cfea66e4 (glob) [1] $ rm -r snot