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

[Matt Mackall]

On Sun, 2011-06-05 at 12:55 +0200, Adrian Buehlmann wrote:
> 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.

Indeed, this whole thread is creep.

The best way to make forward progress is for Rupert to resend his
original patch with the important/controversial line restored. Then we
can continue discussing this piece without holding up the rest of his
efforts.

-- 
Mathematics is the supreme nostalgia of our time.