[PATCH 2 of 3] update: allow branch crossing when clean

Stuart W. Marks smarks at smarks.org
Fri Sep 18 00:45:27 CDT 2009


Martin Geisler wrote:
> "Stuart W. Marks" <smarks at smarks.org> writes:
> 
>> [...] It's probably also worth breaking this into a smaller,
>> self-contained patch as you suggested. I'll do this when I resubmit
>> unless Martin or somebody beats me to it.
> 
> I've just added this change as revision e78967d3dd6f -- under your name,
> I hope you agree :-) The end result is
> 
>   cannot specify both -c/--check and -C/--clean

This is great, thank you!

>> Are error messages really considered part of the interface for
>> compatibility purposes? I note that
>> http://mercurial.selenic.com/wiki/CompatibilityRules says "Changes to
>> error messages and ui.debug messages are usually fine as most of these
>> messages are not intended for parsing."
> 
> Yeah, you're right, maybe I was being too careful.

I just submitted a patch for this. Most of the work was updating the test 
output files.... I changed the message as follows:

-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon

I considered 'hg update -C/--clean' but this would have made the message longer 
than 80 characters. All the other messages I saw were fairly short; not sure 
how particular people are about message lengths.

s'marks


More information about the Mercurial-devel mailing list