Mercurial > hg

changeset 4293:b0140ead7f70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-filebranch: avoid a shell script
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 27 Mar 2007 01:41:16 -0300
parents b90e323a4781
children ccfe423d3d0a
files tests/test-filebranch
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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