Mercurial > hg
comparison tests/test-merge1.t @ 40872:07e181ed82ef
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 |
comparison
equal
deleted
inserted
replaced
40871:1aedbf3ef3d1 | 40872:07e181ed82ef |
---|---|
9 > except ImportError: | 9 > except ImportError: |
10 > pass | 10 > pass |
11 > | 11 > |
12 > print("merging for", os.path.basename(sys.argv[1])) | 12 > print("merging for", os.path.basename(sys.argv[1])) |
13 > EOF | 13 > EOF |
14 $ HGMERGE="$PYTHON ../merge"; export HGMERGE | 14 $ HGMERGE="\"$PYTHON\" ../merge"; export HGMERGE |
15 | 15 |
16 $ hg init t | 16 $ hg init t |
17 $ cd t | 17 $ cd t |
18 $ echo This is file a1 > a | 18 $ echo This is file a1 > a |
19 $ hg add a | 19 $ hg add a |