[PATCH 1 of 6] py3: quote $PYTHON in test-merge-symlinks.t

Matt Harbison mharbison72 at gmail.com
Tue Oct 2 04:30:31 UTC 2018


# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1538437145 14400
#      Mon Oct 01 19:39:05 2018 -0400
# Node ID f03d553395ca841edc5bd3bc5953758c2ed8e16a
# Parent  a6f8ab537908b0b4d8abd0c5c9c971964dec7128
py3: quote $PYTHON in test-merge-symlinks.t

diff --git a/tests/test-merge-symlinks.t b/tests/test-merge-symlinks.t
--- a/tests/test-merge-symlinks.t
+++ b/tests/test-merge-symlinks.t
@@ -38,7 +38,7 @@ a file, once as a link. Bundle was gener
 Merge them and display *_ISLINK vars
 merge heads
 
-  $ hg merge --tool="$PYTHON ../echo.py"
+  $ hg merge --tool="\"$PYTHON\" ../echo.py"
   merging l
   HG_FILE l
   HG_MY_ISLINK 1
@@ -54,7 +54,7 @@ merge working directory
   $ hg up -C 2
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg copy l l2
-  $ HGMERGE="$PYTHON ../echo.py" hg up 3
+  $ HGMERGE="\"$PYTHON\" ../echo.py" hg up 3
   merging l2
   HG_FILE l2
   HG_MY_ISLINK 1


More information about the Mercurial-devel mailing list