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

Matt Mackall mpm at selenic.com
Sat Jun 4 15:15:29 CDT 2011


On Sat, 2011-06-04 at 22:04 +0200, rupert THURNER wrote:
> # HG changeset patch
> # User rupert THURNER <rupert.thurner at gmail.com>
> # Date 1307217421 -7200
> # Node ID f59a8551d77b724ff51857c8a6437e09e10505d7
> # Parent  cd31a1cc15217a120cf58a5cd6ebb25c6ca270bf
> revert: simplify help message, better error message on reverting a merge
> 
> Currently the help message of revert does not fit on a small terminal, but rephrasing a little bit makes it short enough to fit again. As well, trying a revert after rolling back a merge gives an error message which does not output a command which when applied again ends in an error message.
> 
> diff -r cd31a1cc1521 -r f59a8551d77b mercurial/commands.py
> --- a/mercurial/commands.py	Sat Jun 04 20:01:01 2011 +0900
> +++ b/mercurial/commands.py	Sat Jun 04 21:57:01 2011 +0200
> @@ -4089,41 +4089,29 @@
>      """restore individual files or directories to an earlier state
>  
>      .. note::
> -       This command is most likely not what you are looking for.

This line is important.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list