[issue2681] Default failure message when unresolved files is dangerous

[Antoine Pitrou]

New submission from Antoine Pitrou <pitrou at free.fr>:

$ hg ci -m "Merge latest mainline changes"
abort: unresolved merge conflicts (see hg resolve)

Here, I am tempted to launch "hg resolve" as suggested by the message. But
this will actively destroy any conflict resolution I have done manually,
instead of simply listing which files I must mark resolved. This makes the
above message dangerous for the user.

I would actually advocate removing parameter-less "hg resolve", since I find
its behaviour questionable (why drop all user changes? that must be the only
hg command that destroys stuff without any specific parameter); but I guess
some people would be opposed.

But at least the message should be changed; I have been bitten more than
once and it's very painful to lose changes.

----------
messages: 15504
nosy: pitrou
priority: bug
status: unread
title: Default failure message when unresolved files is dangerous

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2681>
____________________________________________________