[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

checking changesets

     2

checking manifests

     3

crosschecking files in changesets and manifests

     4

checking files

     5

1 files, 1 changesets, 1 total revisions

     6

requesting all changes

     7

adding changesets

     8

adding manifests

     9

adding file revisions

    10

modified 1 files, added 1 changesets and 1 new revisions

    11

checking changesets

    12

checking manifests

    13

crosschecking files in changesets and manifests

    14

checking files

    15

1 files, 1 changesets, 1 total revisions

    16

foo

    17

2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo

    18

killed!