tests/test-merge4
author mpm@selenic.com
Fri, 24 Jun 2005 23:20:30 -0800
changeset 467 9d5447a366a7
parent 416 5e9e8b8d2629
child 749 7e4843b7efd2
permissions -rwxr-xr-x
Add version command -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add version command Suggested by Arun Sharma manifest hash: 7fc056ffe45ee854f00e76916a560fba28c74a91 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQW+ywK+sNU5EO8RAqGQAJ91Eysw4tHVpOB7ICeN9hMF/p+lfQCgksmg TAKr5VNrw2wIZtSKjgQRqiA= =8w84 -----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