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

[Martin Geisler]

Jonathan Nieder <jrnieder at gmail.com> writes:

> Kevin Bullock wrote:
>> On Feb 3, 2011, at 12:15 AM, Jonathan Nieder wrote:
>>> Kevin Bullock wrote:
>
>>>> By default, the backout changeset will have just one parent, maintaining
>>>> a linear history. With the --merge option, first a new changeset is
>>>> committed as a child of REV that undoes its changes. This backout
>>>> changeset is then merged as normal with the working directory parent.
> [...]
>> Fair enough, it was totally off-the-cuff. But I found your original
>> rewording a little confusing as to the actual changesets one ends up
>> with.
>
> Good point; thanks.  Maybe something as simple as the following could
> do.
>
> # 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

Thanks, I'll push this when the crew repository is back up!

-- 
Martin Geisler

aragost Trifork
Professional Mercurial support
http://aragost.com/en/services/mercurial/blog/