[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

     3

mkdir t

     4

cd t

     5

hg init

     6

echo This is file a1 > a

     7

echo This is file b1 > b

     8

hg add a b

     9

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

    10

echo This is file b22 > b

    11

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

    12

hg update 0

    13

rm b

    14

hg commit -A -t"comment #2" -d "0 0" -u user

    15

# in theory, we shouldn't need the "yes k" below, but it prevents

    16

# this test from hanging when "hg update" erroneously prompts the

    17

# user for "keep or delete"

    18

yes k | hg update 1

    19

# we exit with 0 to avoid the unavoidable SIGPIPE from above causing

    20

# us to fail this test

    21

exit 0