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

[Gilles Moris]

On Wednesday 02 February 2011 12:12:06 pm timeless wrote:
> >> +    Before version 1.7, the default behavior (without --merge) was
>
> Before version 1.7, the default behavior was equivalent to specifying
> --merge.
>
> >> +    different. To restore the previous default behavior, use
> >>
> >>      :hg:`backout --merge` and then :hg:`update --clean .` to get rid of
> >>
> >>      the ongoing merge.
>
> 'ongoing' is not a word you want to use. And I don't understand what
> the 'and then ...' stuff is doing, please explain it to the list and
> someone can try to suggest something.
>

Before 1.6, without --merge, there was just this new head created as a child 
of the REV you want do undo. But it was not merge with the working repository 
parent, just hanging around. The --merge option was just a kind of macro 
saying "and by the way, merge this new head with the parent of the working 
directory". Basically: --merge was equivalent to type after hg backout:
  hg merge tip.

So to restore the old behavior without --merge, you just need to cancel that 
merge: hg update --clean

> > Please feel free to discard those non English speaker comments if you
> > think they don't make sense.
>
> Gilles: nope, in this case I was going to comment on those things but
> you saved me that effort. :)

Thanks ;-)
Gilles.