tests/test-merge5
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 15 Jul 2005 12:17:03 +0100
changeset 711 734712f37de3
parent 415 c2b9502a4e96
child 749 7e4843b7efd2
permissions -rwxr-xr-x
Show filename for hg export in verbose mode. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Show filename for hg export in verbose mode. manifest hash: 4fbb7bb566ef04e64079fb1fd61974ad47f22e7c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC15svW7P1GVgWeRoRAleQAJ4kXmyj+56kTb5lV9VrQYpu4O3h5ACfXU5W M0TB/OvU0g5uvudZVQMsJd0= =yq7Y -----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