tests/test-merge4
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 27 Jun 2005 06:52:13 +0100
changeset 492 9bd468e36de3
parent 416 5e9e8b8d2629
child 749 7e4843b7efd2
permissions -rwxr-xr-x
Use "kill $!" to kill running background processes. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Use "kill $!" to kill running background processes. manifest hash: 94563ef45ac0c8d15c9c827430f3d87380946434 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCv5QNW7P1GVgWeRoRAm+1AJwMopIWkvc/eG21mm/gbTrC9sCvhACePQl/ VOPdJKQxutQTCdAqA8iMzck= =7ejv -----END PGP SIGNATURE-----

#!/bin/sh -x

hg init
echo This is file a1 > a
hg add a
hg commit -t "commit #0" -d "0 0" -u user
echo This is file b1 > b
hg add b
hg commit -t "commit #1" -d "0 0" -u user
hg update 0
echo This is file c1 > c
hg add c
hg commit -t "commit #2" -d "0 0" -u user
hg update -m 1
rm b
echo This is file c22 > c
hg commit -t "commit #3" -d "0 0" -u user