tests/test-merge2
author mpm@selenic.com
Tue, 28 Jun 2005 02:34:14 -0800
changeset 507 dd8b19114fe7
parent 409 feadc9697b43
child 749 7e4843b7efd2
permissions -rwxr-xr-x
README: mention lib64/ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 README: mention lib64/ manifest hash: 66865206771f64e1257235c8cf551edf77d2712c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSemywK+sNU5EO8RAn/kAJ9NhZLCNdOI09rSL22p6zVsoMLyXACdGzVh 6hfXMuxEjn84xTLS4xJ2OLo= =VQie -----END PGP SIGNATURE-----

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