view tests/test-merge5 @ 455:8d43dfdfb514

More FAQ updates -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 More FAQ updates manifest hash: 98447c3da5aefcc6c4071d03d8014944cf4cbb79 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCu3TCywK+sNU5EO8RArRjAJ0ZtMHztUL1cQw7FC0C3uJ0YIfKjwCfWfSe JndrQxPs1QeCPK/RbfYiKjE= =aMHP -----END PGP SIGNATURE-----
author mpm@selenic.com
date Thu, 23 Jun 2005 18:49:38 -0800
parents c2b9502a4e96
children 7e4843b7efd2
line wrap: on
line source

#!/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