tests/test-merge5
author mpm@selenic.com
Tue, 28 Jun 2005 02:22:45 -0800
changeset 505 dc1f735dfaac
parent 415 c2b9502a4e96
child 749 7e4843b7efd2
permissions -rwxr-xr-x
[PATCH] Fix "no-update" option to clone -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Fix "no-update" option to clone From: Bryan O'Sullivan <bos@serpentine.com> Turn "no-update" (invalid Python identifier) into "noupdate". manifest hash: 1dfb3212b97531437d5a243813896c090a05d95a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwST1ywK+sNU5EO8RAvGnAJ9/RvohYRxpMTWkK6YCiF6r3U68FACeNRcr mE/NYJzVbijiLK9TwWm8QgQ= =w/KV -----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