--- a/tests/test-merge-force.t Thu Jun 15 14:22:39 2017 -0400
+++ b/tests/test-merge-force.t Tue Jun 20 09:45:02 2017 -0400
@@ -10,26 +10,26 @@
Create base changeset
- $ python $TESTDIR/generate-working-copy-states.py state 3 1
+ $ $PYTHON $TESTDIR/generate-working-copy-states.py state 3 1
$ hg addremove -q --similarity 0
$ hg commit -qm 'base'
Create remote changeset
- $ python $TESTDIR/generate-working-copy-states.py state 3 2
+ $ $PYTHON $TESTDIR/generate-working-copy-states.py state 3 2
$ hg addremove -q --similarity 0
$ hg commit -qm 'remote'
Create local changeset
$ hg update -q 0
- $ python $TESTDIR/generate-working-copy-states.py state 3 3
+ $ $PYTHON $TESTDIR/generate-working-copy-states.py state 3 3
$ hg addremove -q --similarity 0
$ hg commit -qm 'local'
Set up working directory
- $ python $TESTDIR/generate-working-copy-states.py state 3 wc
+ $ $PYTHON $TESTDIR/generate-working-copy-states.py state 3 wc
$ hg addremove -q --similarity 0
$ hg forget *_*_*_*-untracked
$ rm *_*_*_missing-*
@@ -286,7 +286,7 @@
the remote side did not touch the file
$ checkstatus() {
- > for f in `python $TESTDIR/generate-working-copy-states.py filelist 3`
+ > for f in `$PYTHON $TESTDIR/generate-working-copy-states.py filelist 3`
> do
> echo
> hg status -A $f
@@ -667,7 +667,7 @@
missing_missing_missing_missing-untracked: * (glob)
<missing>
- $ for f in `python $TESTDIR/generate-working-copy-states.py filelist 3`
+ $ for f in `$PYTHON $TESTDIR/generate-working-copy-states.py filelist 3`
> do
> if test -f ${f}.orig
> then
@@ -784,7 +784,7 @@
$ hg -q update --clean 2
$ hg --config extensions.purge= purge
- $ python $TESTDIR/generate-working-copy-states.py state 3 wc
+ $ $PYTHON $TESTDIR/generate-working-copy-states.py state 3 wc
$ hg addremove -q --similarity 0
$ hg forget *_*_*_*-untracked
$ rm *_*_*_missing-*