tests/test-merge5
author mpm@selenic.com
Tue, 28 Jun 2005 02:04:49 -0800
changeset 502 509e62469cb1
parent 415 c2b9502a4e96
child 749 7e4843b7efd2
permissions -rwxr-xr-x
Update undo test -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Update undo test manifest hash: b168c0b983b6aaeaf9cf4c74d65047eb4a5629f9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSDBywK+sNU5EO8RAswoAKCb98RFAlTrEjsqGKhDX70m/CqriwCdGDOj LFlbZE+HoloZxTjXPaLpVmI= =dYu8 -----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