Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-simplemerge-cmd @ 4363:c6413f8f2f8e
Use python instead of shell printf with \x for test-simplemerge-cmd
Needed e.g. to be compatible with Solaris.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Thu, 19 Apr 2007 12:47:55 +0200 |
| parents | d5c3a70f8422 |
| children |
comparison
equal
deleted
inserted
replaced
| 4362:390d110a57b8 | 4363:c6413f8f2f8e |
|---|---|
| 40 | 40 |
| 41 echo '% too many labels' | 41 echo '% too many labels' |
| 42 python simplemerge -p -L foo -L bar -L baz conflict-local base conflict-other | 42 python simplemerge -p -L foo -L bar -L baz conflict-local base conflict-other |
| 43 | 43 |
| 44 echo '% binary file' | 44 echo '% binary file' |
| 45 printf '\x00' > binary-local | 45 python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()" |
| 46 cat orig >> binary-local | 46 cat orig >> binary-local |
| 47 python simplemerge -p binary-local base other | 47 python simplemerge -p binary-local base other |
| 48 | 48 |
| 49 echo '% binary file --text' | 49 echo '% binary file --text' |
| 50 python simplemerge -a -p binary-local base other | 50 python simplemerge -a -p binary-local base other |