Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge2 @ 492:9bd468e36de3
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-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 27 Jun 2005 06:52:13 +0100 |
parents | feadc9697b43 |
children | 7e4843b7efd2 |
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 -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 rm b hg update 0 echo This is file b2 > b hg add b hg commit -t "commit #2" -d "0 0" -u user cd ..; /bin/rm -rf t mkdir t cd t 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 rm b hg update 0 echo This is file b2 > b hg commit -A -t "commit #2" -d "0 0" -u user cd ..; /bin/rm -rf t mkdir t cd t 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 rm b hg remove b hg update 0 echo This is file b2 > b hg commit -A -t "commit #2" -d "0 0" -u user cd ..; /bin/rm -rf t