# HG changeset patch
# User Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Date 1174970480 10800
# Node ID c2c8491a30d63686dede382f4871f8d34759ef73
# Parent  a745860231967f73b1640f85f8c8db29fc783924
test-rename-merge2: avoid a shell script

diff -r a74586023196 -r c2c8491a30d6 tests/test-rename-merge2
--- 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