[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-----

#!/bin/sh

export HGMERGE=true

set -ex
mkdir r1
cd r1
hg init
echo a > a
hg addremove
hg commit -t "1" -u test -d "0 0"

hg clone . ../r2
cd ../r2
hg up
echo abc > a
hg diff > ../d
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d

cd ../r1
echo b > b
echo a2 > a
hg addremove
hg commit -t "2" -u test -d "0 0"

cd ../r2
hg -q pull ../r1
hg status
hg -d up
hg -d up -m
hg parents
hg -v history
hg diff > ../d
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d