view tests/test-merge5 @ 571:c7364b985ca2

[PATCH 3/5]: cleaning the template parent management in hgweb -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH 3/5]: cleaning the template parent management in hgweb From: Goffredo Baroncelli <kreijack@libero.it> the filediff template use the old style p1/p2 and p1rev/p2rev inteface; the patch removes this old stuff, and update the code to the new style manifest hash: 29536b6ee71f03a48bceb7336040070ecd0d2b9e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxvplywK+sNU5EO8RApW4AKCrTLHofr8jELtvNRpoNJHc0sjEfgCfaY2q /H96T6BMMXA4VLFVxzOBHCo= =u4El -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 02 Jul 2005 12:34:45 -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