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

Adrian Buehlmann adrian at cadifra.com
Thu Sep 17 13:27:02 CDT 2009


On 17.09.2009 19:27, Stuart W. Marks wrote:
> The original message from the patch was "cannot specify both --check and 
> --clean at the same time" which, now that I look at it again, is redundant. 
> It's unnecessary to say "both" and "at the same time". This can certainly be 
> shortened to
> 
> "cannot specify both --check and --clean"
> 
> The source base seems quite inconsistent on its use of short or long options in 
> error messages. But it seems like you guys had agreed that there are already 
> more mentions of '-C' than '--clean' so I can certainly go with this:
> 
> "cannot specify both -c and -C"

I'm fine with any of the two, or if Martin prefers the original version,
I'm fine with that as well.

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

Yes, please definitely put this new abort message in a single dead simple isolated
patch and take it out of this series here.

We can revisit your other changes from this series and Martin's contemplated
message changes later.




More information about the Mercurial-devel mailing list