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

     1

#!/bin/sh -x

     2

hg init

     3

echo This is file a1 > a

     4

hg add a

     5

hg commit -t "commit #0" -d "0 0" -u user

     6

ls

     7

echo This is file b1 > b

     8

hg add b

     9

hg commit -t "commit #1" -d "0 0" -u user

    10

hg co 0

    11

# B should disappear

    12

ls