Mercurial > hg

diff tests/test-merge1.t @ 40872:07e181ed82ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: quote several instances of $PYTHON for Windows Python3 lives in Program Files by default. The last remaining unquoted instance is in test-hghave.t. I can't figure out how to quote that, as it either complains: 'c:\\Program' is not recognized as an internal or external command, operable program or batch file. or $TESTTMP.sh: line 22: "C:/Program Files/Python37/python.exe": $ENOENT$
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 09 Dec 2018 21:23:34 -0500
parents c8514f858788
children 12243f15d53e
line wrap: on
line diff
--- a/tests/test-merge1.t	Sun Dec 09 18:35:35 2018 -0500
+++ b/tests/test-merge1.t	Sun Dec 09 21:23:34 2018 -0500
@@ -11,7 +11,7 @@
   > 
   > print("merging for", os.path.basename(sys.argv[1]))
   > EOF
-  $ HGMERGE="$PYTHON ../merge"; export HGMERGE
+  $ HGMERGE="\"$PYTHON\" ../merge"; export HGMERGE
 
   $ hg init t
   $ cd t