[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

mkdir test

     4

cd test

     5

echo foo>foo

     6

hg init

     7

hg addremove

     8

hg commit -t "1"

     9

hg verify

    10

hg serve -p 20059 2>/dev/null &

    11

cd ..

    12

    13

mkdir copy

    14

cd copy

    15

hg init http://localhost:20059/

    16

hg verify

    17

hg co

    18

cat foo

    19

hg manifest

    20

    21

kill %hg