[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> If an "hg update" is attempted across branches, it is aborted with an error message, basically saying that "update -m" is required. Don't prompt the user for "keep vs delete" kinds of questions before deciding to abort. manifest hash: 250d3a0e866af2feac9344d499b26c254c33abc4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNeDywK+sNU5EO8RAu2BAJwNWXXN2L+4TnOUGaOe9iBj6CgOYgCfRKIE RF5czx2UQ2pSIP119xzq9mQ= =Akj6 -----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