# HG changeset patch # User Matt Harbison # Date 1497499018 14400 # Node ID 29558247b00eff8c95c7604032b59cfbab34010d # Parent 9d76812f9b0bdd0af9b4ea68bb16765c591d9b4a 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..." diff -r 9d76812f9b0b -r 29558247b00e tests/test-dirstate-race.t --- 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