[PATCH] merge: output the complete options in the guidance text, not only the often used. Change it as well in the test case outputs.

[Martin Geisler]

Matt Mackall <mpm at selenic.com> writes:

> On Sat, 2010-06-26 at 13:33 +0200, rupert THURNER wrote:
>> # HG changeset patch
>> # User Rupert THURNER <rupert.thurner at gmail.com>
>> # Date 1277550559 -7200
>> # Node ID 74e62efe1bc867702df88e0f5c8b9bf1c18ca207
>> # Parent  8b452fe4bf506a1a08bbc7e1bac81aceda8f4d10
>> merge: output the complete options in the guidance text, not only the
>> often used. Change it as well in the test case outputs.
>
> For future reference, updating the translation files isn't your job -
> translators will do that as needed.

Yes, and it is infact quite bad to update the msgid entries without
marking the translations as fuzzy. The problem is that you just claimed
that the old translation is a correct translation of the new msgid!

When the translation is not marked fuzzy (done automatically by
msgmerge), the translators will never know about the change.

> I'm still not sold on this: up -C is dangerous and handing it to
> clueless users without caveats isn't a great idea. How about something
> like:
>
> diff -r b9a46acdfe1f mercurial/commands.py
> --- a/mercurial/commands.py	Sat Jun 26 12:26:03 2010 -0500
> +++ b/mercurial/commands.py	Sun Jun 27 12:04:41 2010 -0500
> @@ -2570,6 +2570,10 @@
>      head, the other head is merged with by default. Otherwise, an
>      explicit revision with which to merge with must be provided.
>  
> +    To undo an uncommitted merge, use :hg:`update --clean .` which
> +    will check out a clean copy of the first parent, losing all
> +    changes.

I like it!


-- 
Martin Geisler

Mercurial links: http://mercurial.ch/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20100627/479915f5/attachment.pgp>