hgweb: fix deleted file in changeset key error -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: fix deleted file in changeset key error We simply point to nullid. This is very arguably the correct thing to do. manifest hash: c16f1c05a087e5d3274cb84dfd09d048430f0495 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsPCdywK+sNU5EO8RAuJzAJ9j2Yn7KHceFxYgKvOd5V4fNNLKmQCfTZ9s jorkRZcX2hdZqRkxM8q8VMk= =+bEb -----END PGP SIGNATURE-----

#!/bin/bash

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"

cd ..
mkdir r2
cd r2
hg init ../r1
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