[PATCH] revert: simplify help message, better error message on reverting a merge

Adrian Buehlmann adrian at cadifra.com
Sun Jun 5 05:55:44 CDT 2011


On 2011-06-05 12:01, timeless wrote:
> On Sun, Jun 5, 2011 at 3:34 AM, Adrian Buehlmann <adrian at cadifra.com> wrote:
>> +    .. warning::
>> +       In contrast to the update command, revert never changes the
>> +       parent revisions of the working directory. Revert thus cannot
>> +       completely set the working directory state back to an earlier
>> +       revision nor can it undo a merge.
>> +       Use :hg:`update -r REV` to check out an earlier revision, or
>> +       :hg:`update --clean .` to undo a uncommitted merge.
>>
>>
>> This proposal fulfills Matt's requirement that the first sentence must
>> be a warning by changing "note:" to "warning:".
> 
> it occurs to me that we might also want to point to backout...

IMHO, patch scope creep.

hg help revert doesn't currently mention backout.




More information about the Mercurial-devel mailing list