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

[Martin Geisler]

"Stuart W. Marks" <smarks at smarks.org> writes:

> 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

Looks good, I can put this in tonight unless there are any protests.

> 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.

I think they should be kept short in order to keep the special lean
style Mercurial currently has. I like it that most commands give no or a
single line as output.

Writing 'hg update -C/--clean' is also bad because it isn't a valid
command :-)

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.