tests/test-merge2
author mpm@selenic.com
Thu, 23 Jun 2005 13:51:22 -0800
changeset 448 20fc66131bc0
parent 409 feadc9697b43
child 749 7e4843b7efd2
permissions -rwxr-xr-x
Minor packaging fixups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Minor packaging fixups manifest hash: f588ece18c1e43697c4188d94ecb034e591913a1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuy7aywK+sNU5EO8RAoxdAJ4l8MRhmzBo15LPnk/kb11MbSYwMQCgrLuJ o8LeT5YpTESNtXcKqA+2dxg= =lcNo -----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