Mercurial > public > mercurial-scm > hg
diff tests/test-merge-tools @ 10775:c52057614c72 stable
Tests with spaces in paths
This allows most tests to succeed with
./run-tests.py --tmpdir='/tmp/hg test'
and introduces other tests for spaces and shell quoting
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Wed, 24 Mar 2010 01:43:24 +0100 |
| parents | 08a0f04b56bd |
| children | 4c94b6d0fb1c |
line wrap: on
line diff
--- a/tests/test-merge-tools Fri Mar 26 17:02:49 2010 +0100 +++ b/tests/test-merge-tools Wed Mar 24 01:43:24 2010 +0100 @@ -62,7 +62,7 @@ echo "# hg merge -r 2" # override $PATH to ensure hgmerge not visible; use $PYTHON in case we're # running from a devel copy, not a temp installation -PATH=$BINDIR $PYTHON $BINDIR/hg merge -r 2 +PATH="$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2 aftermerge echo "# simplest hgrc using false for merge:" @@ -177,6 +177,17 @@ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $output' aftermerge +echo '# Merge using tool with a path that must be quoted:' +beforemerge +cat <<EOF > 'my merge tool' +#!/bin/sh +cat "\$1" "\$2" "\$3" > "\$4" +EOF +chmod +x 'my merge tool' +hg merge -r 2 --config merge-tools.true.executable='./my merge tool' --config merge-tools.true.args='$base $local $other $output' +rm -f 'my merge tool' +aftermerge + echo echo Merge post-processing