view tests/test-merge4 @ 540:53872e2be33a

TODO tweaks -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 TODO tweaks manifest hash: 7b4c0443e17f1d848b7b7c9fe62407bf80c0a874 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxO9gywK+sNU5EO8RAisZAJwJPvdoKuL12u+C0+RLD7A+coQrIgCgsiNQ +Kml7VZ5cyCaZNCGgFYSemg= =hIqs -----END PGP SIGNATURE-----
author mpm@selenic.com
date Thu, 30 Jun 2005 23:23:12 -0800
parents 5e9e8b8d2629
children 7e4843b7efd2
line wrap: on
line source

#!/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