# HG changeset patch
# User Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Date 1174970476 10800
# Node ID b0140ead7f70a5eae74587cdcd6e93287e555f2b
# Parent  b90e323a478107fe5a60533628b83b332f97fb88
test-filebranch: avoid a shell script

diff -r b90e323a4781 -r b0140ead7f70 tests/test-filebranch
--- a/tests/test-filebranch	Sat Dec 30 21:33:45 2006 +0200
+++ b/tests/test-filebranch	Tue Mar 27 01:41:16 2007 -0300
@@ -3,11 +3,11 @@
 # This test makes sure that we don't mark a file as merged with its ancestor
 # when we do a merge.
 
-cat <<'EOF' > merge
-#!/bin/sh
-echo merging for `basename $1`
+cat <<EOF > merge
+import sys, os
+print "merging for", os.path.basename(sys.argv[1])
 EOF
-chmod +x merge
+HGMERGE="python ../merge"; export HGMERGE
 
 echo creating base
 hg init a
@@ -41,7 +41,7 @@
 
 echo merging
 hg pull ../a
-env HGMERGE=../merge hg merge -v
+hg merge -v
 
 echo 2m > foo
 echo 2b > baz