Mercurial > hg
view tests/test-merge2 @ 798:c28f9feb7c2e
Make tests work on Solaris:
- replacement for mktemp
- fall back if shell arithmetic doesn't work
- replacement for 'set -x' (which results look different with some shells)
- "FOO=bar; export FOO" instead of "export FOO=bar"
- don't use 'if ! ...'
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 15:11:05 +0100 |
parents | 7e4843b7efd2 |
children | ec85f9e6f3b1 8f5637f0a0c0 0902ffece4b4 |
line wrap: on
line source
#!/bin/sh -x mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -m "commit #0" -d "0 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "0 0" rm b hg update 0 echo This is file b2 > b hg add b hg commit -m "commit #2" -d "0 0" cd ..; /bin/rm -rf t mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -m "commit #0" -d "0 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "0 0" rm b hg update 0 echo This is file b2 > b hg commit -A -m "commit #2" -d "0 0" cd ..; /bin/rm -rf t mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -m "commit #0" -d "0 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "0 0" rm b hg remove b hg update 0 echo This is file b2 > b hg commit -A -m "commit #2" -d "0 0" cd ..; /bin/rm -rf t