mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
bc5ccf31e3
-----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-----
19 lines
432 B
Plaintext
19 lines
432 B
Plaintext
+ mkdir t
|
|
+ cd t
|
|
+ hg init
|
|
+ echo This is file a1
|
|
+ echo This is file b1
|
|
+ hg add a b
|
|
+ hg commit -t 'commit #0' -d '0 0' -u user
|
|
+ echo This is file b22
|
|
+ hg commit '-tcomment #1' -d '0 0' -u user
|
|
+ hg update 0
|
|
+ rm b
|
|
+ hg commit -A '-tcomment #2' -d '0 0' -u user
|
|
+ yes k
|
|
+ hg update 1
|
|
this update spans a branch affecting the following files:
|
|
aborting update spanning branches!
|
|
(use update -m to perform a branch merge)
|
|
+ exit 0
|