view tests/test-merge5 @ 483:27f5569a5814

Updated TODO

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Updated TODO

manifest hash: c73376bc97920d14c8e29311a76313afd71ed457
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFCvtiZW7P1GVgWeRoRAsdeAKCazz6dq6fiuq37FGsRKbavfW+4xwCeKbmG
N7HBvJ71yVTX45heHiSh8c8=
=AgqS
-----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