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

[Martin Geisler]

Adrian Buehlmann <adrian at cadifra.com> writes:

>>> +    if check and clean:
>>> +        raise util.Abort(_("can't specify both -C and -c"))
>>> +
>> 
>> No, I think we should keep to full, proper English sentences. I'll
>> have to write 'kan ikke' (cannot) in Danish anyway since we don't
>> have a word for the contraction. I also prefer the full option names
>> since I think they add clarity.
>
> Well, I thought if it is good enough for tar we could do something
> similar
>
> %tar xc
> tar: Can't specify both -c and -x

It was just my opinion, I did not look at other program to compare.

> And every other existing "Abort: crosses branches ..." message of
> mercurial uses short form -C as well.

Yes, most of them do and I think it's a shame.

I also thinks is a shame we have a message suggesting 'hg up --clean'
instead of 'hg update --clean'. I think we should refer to the commands
by their full names.

> Are you going to change these too?

No, it would break scripts that look for the short form.

-- 
Martin Geisler

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