[PATCH] expand and clarify help for update

Adrian Buehlmann adrian at cadifra.com
Wed Oct 29 15:39:19 UTC 2008


On 29.10.2008 16:18, Greg Ward wrote:
> On 28 October 2008, Adrian Buehlmann said:
>> The patched part would end as:
> 
> This is following up the rewrite suggested by Hubert Kauker and refined
> by me, right?  It seems like this particular help text is getting longer
> and longer!
> 

Yes. This happened while I was doing that one small fix
on top of your changes [1] (patch provided by Giorgos).

It got indeed quite a bit longer now. But better be precise.

I really prefer to describe what happens with the parents and
explain how -C aborts a hg merge (while we are at it).

>>     Use option -C to discard all uncommitted changes (no backups!) and
>>     to discard any uncomitted 'hg merge', thus forcibly replacing the
> 
> "thus" is unnecessary here -- I suggest removing it.

That's fine with me. I will remove "thus" and resend the patch.

> Apart from that, it reads fine to me.

Thanks for checking.

[1] http://hg.intevation.org/mercurial/crew/rev/08dc0152bb5e




More information about the Mercurial mailing list