tests/test-merge2
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 14 Jul 2005 17:22:20 +0100
changeset 702 a1099c50a622
parent 409 feadc9697b43
child 749 7e4843b7efd2
permissions -rwxr-xr-x
Fix default values and add interactive setting to [ui] section of hgrc docs. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix default values and add interactive setting to [ui] section of hgrc docs. manifest hash: 211eea218970b45b2a0cdc822d5b6610a89ffbd7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1pE8W7P1GVgWeRoRAof+AJ4mpm3DCRqh+9To3Gn4bpC7UGcTnQCfVIWN 5VT9pqdP6/06tH8nYgW55f4= =uNyy -----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