tests/test-merge2
author mpm@selenic.com
Wed, 29 Jun 2005 21:55:25 -0800
changeset 528 648386fabf9c
parent 409 feadc9697b43
child 749 7e4843b7efd2
permissions -rwxr-xr-x
Fix clone bug wth trailing slash -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix clone bug wth trailing slash manifest hash: ca78730f00063c57b70db69cf9ecfc3f83c02e84 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCw4lNywK+sNU5EO8RApq+AJ9YTl92lLnk9UMvWWSeEue/siS6pACgsg68 FLAc0OVzeULP7ORKRHCtpQI= =IL3R -----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