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