tests/test-merge5
author Matt Mackall <mpm@selenic.com>
Wed, 06 Jul 2005 22:37:06 -0800
changeset 647 732ca4b56b7f
parent 415 c2b9502a4e96
child 749 7e4843b7efd2
permissions -rwxr-xr-x
update test-hup permissions -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 update test-hup permissions manifest hash: a041df3958fb7508e34ce7c736c196217bbcf8a7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzM2SywK+sNU5EO8RAnKvAKC1+ilD53KpBwplk5iaUMra4h3GDgCgsM4f R+RswPBjW8I51vNyvZ45AvM= =dQjV -----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