Mercurial > hg
comparison tests/test-merge5.out @ 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 | d45d1c90032e |
comparison
equal
deleted
inserted
replaced
414:291a62848f54 | 415:c2b9502a4e96 |
---|---|
1 + mkdir t | |
2 + cd t | |
3 + hg init | |
4 + echo This is file a1 | |
5 + echo This is file b1 | |
6 + hg add a b | |
7 + hg commit -t 'commit #0' -d '0 0' -u user | |
8 + echo This is file b22 | |
9 + hg commit '-tcomment #1' -d '0 0' -u user | |
10 + hg update 0 | |
11 + rm b | |
12 + hg commit -A '-tcomment #2' -d '0 0' -u user | |
13 + yes k | |
14 + hg update 1 | |
15 this update spans a branch affecting the following files: | |
16 aborting update spanning branches! | |
17 (use update -m to perform a branch merge) | |
18 + exit 0 |