[PATCH v2] backout: make help more explicit about what backout does

[Kevin Bullock]

On Feb 11, 2011, at 9:24 PM, Jonathan Nieder wrote:

> # HG changeset patch
> # User Jonathan Nieder <jrnieder at gmail.com>
> # Date 1297480647 21600
> # Branch stable
> # Node ID 1a726da9790bc782912c95cdb92d5ff2c7866da2
> # Parent  02aa06a021a066cb360dc71097dedfa3ef123bb2
> backout: clarify which changesets are new in help text
> 
> Plus another wording tweak ("default behavior -> "behavior without
> --merge").
> 
> Suggested by Kevin Bullock.
> 
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -207,16 +207,16 @@
>     Prepare a new changeset with the effect of REV undone in the
>     current working directory.
> 
> -    If REV is the parent of the working directory, then this changeset
> +    If REV is the parent of the working directory, then this new changeset
>     is committed automatically. Otherwise, hg needs to merge the
>     changes and the merged result is left uncommitted.
> 
>     By default, the pending changeset will have one parent,
>     maintaining a linear history. With --merge, the pending changeset
>     will instead have two parents: the old parent of the working
> -    directory and a child of REV that simply undoes REV.
> +    directory and a new child of REV that simply undoes REV.

Sounds sensible.

pacem in terris / mir / shanti / salaam / heiwa
Kevin R. Bullock