Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use python instead of shell printf with \x for test-simplemerge-cmd
authorThomas Arendsen Hein <thomas@intevation.de>
Thu, 19 Apr 2007 12:47:55 +0200
changeset 4367 c6413f8f2f8e
parent 4366 390d110a57b8
child 4368 97962a3e73cf
Use python instead of shell printf with \x for test-simplemerge-cmd Needed e.g. to be compatible with Solaris.
tests/test-simplemerge-cmd file | annotate | diff | comparison | revisions 
--- a/tests/test-simplemerge-cmd	Mon Apr 16 20:23:45 2007 -0300
+++ b/tests/test-simplemerge-cmd	Thu Apr 19 12:47:55 2007 +0200
@@ -42,7 +42,7 @@
 python simplemerge -p -L foo -L bar -L baz conflict-local base conflict-other
 
 echo '% binary file'
-printf '\x00' > binary-local
+python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()"
 cat orig >> binary-local
 python simplemerge -p binary-local base other
hg-stable