[issue2915] 'hg revert file...' on an uncommitted merge now proceeds silently

[Jesse Glick]

New submission from Jesse Glick <jesse.glick at oracle.com>:

Thread: "[PATCH RFC] revert: add --force option"

Prior to 1.9, when running 'hg revert' on an uncommitted merge, you had to
(a) pass either -a or some files, (b) and pass '-r .'. Now as of
afe0d4c24866 someone can revert some files in the working copy to the first
merge parent and then commit, effectively backing out all work done in those
files, without any warnings being displayed. This is a particular risk for
novice users encountering merge conflicts and becoming confused by
uncommitted modifications coming from the second merge parent.

At least before, they would get an error message and be forced to pass '-r .'.

----------
messages: 16936
nosy: jglick
priority: urgent
status: unread
title: 'hg revert file...' on an uncommitted merge now proceeds silently
topic: 1.9

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