Mercurial > hg > gitweb
changeset 4296:c2c8491a30d6
test-rename-merge2: avoid a shell script
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Tue, 27 Mar 2007 01:41:20 -0300 |
| parents | a74586023196 |
| children | 27590c19ad30 |
| files | tests/test-rename-merge2 |
| diffstat | 1 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-rename-merge2 Tue Mar 27 01:41:18 2007 -0300 +++ b/tests/test-rename-merge2 Tue Mar 27 01:41:20 2007 -0300 @@ -3,11 +3,13 @@ mkdir -p t cd t -cat <<'EOF' > merge -#!/bin/sh -echo merge $1 $2 $3 > $1 +cat <<EOF > merge +import sys, os +f = open(sys.argv[1], "wb") +f.write("merge %s %s %s" % (sys.argv[1], sys.argv[2], sys.argv[3])) +f.close() EOF -chmod +x merge +HGMERGE="python ../merge"; export HGMERGE # perform a test merge with possible renaming # @@ -49,7 +51,7 @@ echo "--------------" echo "test L:$1 R:$2 W:$3 - $4" echo "--------------" - env HGMERGE=../merge hg merge -y --debug --traceback + hg merge -y --debug --traceback echo "--------------" hg status -camC -X rev