tests/test-merge5
author mpm@selenic.com
Sun, 03 Jul 2005 20:10:21 -0800
changeset 600 11c379e23ad6
parent 415 c2b9502a4e96
child 749 7e4843b7efd2
permissions -rwxr-xr-x
Simplify RSS date generation -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Simplify RSS date generation manifest hash: 3b1628aaee450c292949f6d079b4a05ccb5ce6ab -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyLatywK+sNU5EO8RAiLMAKCqYFyzSDCU6Wm34LSWZroAHMqa4QCfSWv6 jh/vvuQS0qmXybm6Ivd7XVY= =x1Rf -----END PGP SIGNATURE-----

#!/bin/sh -x

mkdir t
cd t
hg init
echo This is file a1 > a
echo This is file b1 > b
hg add a b
hg commit -t "commit #0" -d "0 0" -u user
echo This is file b22 > b
hg commit -t"comment #1" -d "0 0" -u user
hg update 0
rm b
hg commit -A -t"comment #2" -d "0 0" -u user
# in theory, we shouldn't need the "yes k" below, but it prevents
# this test from hanging when "hg update" erroneously prompts the
# user for "keep or delete"
yes k | hg update 1
# we exit with 0 to avoid the unavoidable SIGPIPE from above causing
# us to fail this test
exit 0