tests/test-merge2
author mpm@selenic.com
Sat, 25 Jun 2005 16:31:43 -0800
changeset 473 5914e27dc717
parent 409 feadc9697b43
child 749 7e4843b7efd2
permissions -rwxr-xr-x
[PATCH] Get run-tests working on 64-bit machines. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Get run-tests working on 64-bit machines. From: Bryan O'Sullivan <bos@serpentine.com> manifest hash: 3704997be1744478414cddcd79c7bea5ccd6a1b1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvfdvywK+sNU5EO8RAm5iAJ9mWxI4o2j7IM7Mko7IjfKfNtWJqwCcDekn 6GDlcDo/Q3nv8ybFzykwQjY= =tS2i -----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