[PATCH] Removal of a file added by merging branches -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Removal of a file added by merging branches From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> Fixing a bug where removal of a file which is added when doing a merge would cause python exception to be thrown. manifest hash: 0bdd80e8abcee6aaa4804bb588f9939596fb3dd0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNjLywK+sNU5EO8RAo44AJ4mvjsJcYOj/EmVDFrdkK3D3WHFSwCffxfV cRl8mXc252/oRcYaMZbgrlg= =S5x6 -----END PGP SIGNATURE-----

#!/bin/bash

set -x
hg init
echo a > a
hg add a
hg commit -t "1" -u test -d "0 0"
hg status
cp a b
hg copy a b
hg status
hg -d commit -t "2" -u test -d "0 0"
hg history
hg log a
hexdump -C .hg/data/b.d
hg cat b | md5sum
hg cat a | md5sum
hg verify