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

     4

     5

mkdir test

     6

cd test

     7

echo foo>foo

     8

hg init

     9

hg addremove

    10

hg commit -t "1"

    11

hg verify

    12

cd ..

    13

    14

mkdir branch

    15

cd branch

    16

hg init ../test

    17

hg co

    18

echo bar>>foo

    19

hg commit -t "2"

    20

    21

cd ../test

    22

hg pull ../branch

    23

hg verify

    24

hg co

    25

cat foo

    26

hg manifest