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

     2

     3

set -x

     4

hg init

     5

echo a > a

     6

hg add a

     7

hg commit -t "1" -u test -d "0 0"

     8

hg status

     9

cp a b

    10

hg copy a b

    11

hg status

    12

hg -d commit -t "2" -u test -d "0 0"

    13

hg history

    14

hg log a

    15

hexdump -C .hg/data/b.d

    16

hg cat b | md5sum

    17

hg cat a | md5sum

    18

hg verify