[PATCH] test-dirstate-race: stabilize for Windows

Matt Harbison mharbison72 at gmail.com
Thu Jun 15 04:15:01 UTC 2017


# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1497499018 14400
#      Wed Jun 14 23:56:58 2017 -0400
# Node ID 3529e3a150a1f92ff8586ec61a6736b174283b85
# Parent  3803dbea223e4b726d335879d1e57f688b80713b
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 --git a/tests/test-dirstate-race.t b/tests/test-dirstate-race.t
--- a/tests/test-dirstate-race.t
+++ b/tests/test-dirstate-race.t
@@ -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


More information about the Mercurial-devel mailing list