Issue1533

Title "abort: outstanding uncommitted merges" should mention "update -C"
Priority bug Status resolved
Superseder Nosy List abuehl, cbarrett, djc, durin42
Assigned To Topics

Created on 2009-03-04.09:42:50 by cbarrett, last changed 2009-03-05.02:44:55 by durin42.

Messages
msg8737 (view) Author: durin42 Date: 2009-03-05.02:44:53
Fixed in 9fe7e6acf525.
msg8733 (view) Author: durin42 Date: 2009-03-04.15:18:53
This was confusing to me as well when I first came to hg. +1 on mentioning it 
somewhere more obvious, probably in the message about resolve, eg change that to 
read:
use 'hg resolve' to retry unresolved file merges or 'hg update --clean' to discard 
the merge
msg8731 (view) Author: cbarrett Date: 2009-03-04.09:42:49
Sometimes, you just want to blow away a merge and start over. This is a rough
transcript of what happened to me after some time away from Mercurial:

> hg pull
(+1 heads)
> hg merge
2 files unresolved
use 'hg resolve' to retry unresolved file merges
> hg revert --no-backup --all
abort: uncommitted merge - please provide a specific revision
> hg revert --no-backup --all -r tip
> hg parents
[ two parents listed ]
> hg update -r tip
abort: outstanding uncommitted merges
> hg update --help
 -C --clean  overwrite locally modified files (no backup)
> hg update -C -r tip
0 files unresolved

The UI here is lacking. At the very least the abort from update should mention
-C. The abort from revert could also mention it, but that's debatable.

My suggestion is adding the following line of output below the abort messages:
to throw away the merge completely, use 'hg update --clean'
History
Date User Action Args
2009-09-23 21:23:48mgunlinkissue1780 superseder
2009-08-05 20:45:27sspweb01200linkissue1744 superseder
2009-08-05 20:37:06sspweb01200linkissue1780 superseder
2009-03-05 02:44:55durin42setstatus: chatting -> resolved
nosy: djc, abuehl, cbarrett, durin42
messages: + msg8737
2009-03-04 21:52:57abuehlsetnosy: + abuehl
2009-03-04 15:24:18djcsetnosy: + djc
2009-03-04 15:18:54durin42setstatus: unread -> chatting
nosy: + durin42
messages: + msg8733
2009-03-04 09:42:50cbarrettcreate