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

Adrian Buehlmann adrian at cadifra.com
Sat Jun 4 18:21:05 CDT 2011


On 2011-06-04 22:45, rupert THURNER wrote:
> it is important that software is telling me what i am _not_ looking for ????
> in the first sentence? what do you expect me to do if i read such a
> sentence? should ignore the sentence and continue reading, even if it is not
> what i am looking for? or should i start using google to find out what i
> really wanted? or should i ask the mailing list? i mean ... this is a help
> text - not an ironical puzzle ...

To be honest: I agree with Rupert's sentiment.

The sentence "This command is most likely not what you are looking for." sounds
a bit like a joke.

<enter bikeshed mode>

Perhaps we can reword this part

    Note:
       This command is most likely not what you are looking for. Revert will
       partially overwrite content in the working directory without changing
       the working directory parents. Use "hg update -r rev" to check out
       earlier revisions, or "hg update --clean ." to undo a merge which has
       added another parent.

to

    Note:
       Revert partially overwrites content in the working directory without
       changing the working directory parents. Revert doesn't fully set the
       working directory back to an earlier revision, nor will it undo a
       merge. The update command is needed for these cases: Use "hg update
       -r rev" to check out an earlier revision, or "hg update --clean ." to
       undo a uncommitted merge.


More information about the Mercurial-devel mailing list