Mercurial > hg

changeset 32836:29558247b00e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-dirstate-race: stabilize for Windows Without quoting, the output after "custom merge tool" in the next test is an abort trying to open "C:UsersMattAppData..."
author Matt Harbison <matt_harbison@yahoo.com>
date Wed, 14 Jun 2017 23:56:58 -0400
parents 9d76812f9b0b
children 50586a0a946f
files tests/test-dirstate-race.t
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-dirstate-race.t	Sat May 06 16:24:21 2017 +0900
+++ b/tests/test-dirstate-race.t	Wed Jun 14 23:56:58 2017 -0400
@@ -209,7 +209,7 @@
   $ cat >> $TESTTMP/mergetool-race.sh << EOF
   > echo "custom merge tool"
   > printf "c2\nc3\nc4\n" > \$1
-  > hg --cwd $TESTTMP/repo status
+  > hg --cwd "$TESTTMP/repo" status
   > echo "custom merge tool end"
   > EOF
   $ cat >> $HGRCPATH << EOF