Mercurial > hg
diff tests/test-merge5 @ 415:c2b9502a4e96
[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-----
| author | mpm@selenic.com |
|---|---|
| date | Tue, 21 Jun 2005 19:14:11 -0800 |
| parents | |
| children | 7e4843b7efd2 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-merge5 Tue Jun 21 19:14:11 2005 -0800 @@ -0,0 +1,21 @@ +#!/bin/sh -x + +mkdir t +cd t +hg init +echo This is file a1 > a +echo This is file b1 > b +hg add a b +hg commit -t "commit #0" -d "0 0" -u user +echo This is file b22 > b +hg commit -t"comment #1" -d "0 0" -u user +hg update 0 +rm b +hg commit -A -t"comment #2" -d "0 0" -u user +# in theory, we shouldn't need the "yes k" below, but it prevents +# this test from hanging when "hg update" erroneously prompts the +# user for "keep or delete" +yes k | hg update 1 +# we exit with 0 to avoid the unavoidable SIGPIPE from above causing +# us to fail this test +exit 0