tests/test-merge2
author mpm@selenic.com
Tue, 28 Jun 2005 02:22:45 -0800
changeset 505 dc1f735dfaac
parent 409 feadc9697b43
child 749 7e4843b7efd2
permissions -rwxr-xr-x
[PATCH] Fix "no-update" option to clone -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Fix "no-update" option to clone From: Bryan O'Sullivan <bos@serpentine.com> Turn "no-update" (invalid Python identifier) into "noupdate". manifest hash: 1dfb3212b97531437d5a243813896c090a05d95a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwST1ywK+sNU5EO8RAvGnAJ9/RvohYRxpMTWkK6YCiF6r3U68FACeNRcr mE/NYJzVbijiLK9TwWm8QgQ= =w/KV -----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