[issue1916] hg bails when ) 1) forget to pull/update 2) commit/push specific files only 3) pull/update

[Henrik Stuart]

Matt Mackall wrote:
> On Sun, Nov 22, 2009 at 02:22:12PM +0100, Dan Villiom Podlaski Christiansen wrote:
>> 2009/11/22 Henrik Stuart <hg at hstuart.dk>:
>>> Greg Ward wrote:
>>>> ?? did you forget to pull/merge?
>>>> ?? did you forget to pull then merge?
>>>> ?? did you forget to pull and merge?
>>>>
>>>> since, after all, you typically have to do both.
>> ???
>>> I'd prefer one of the two latter of Greg's suggestions.
>> I prefer the final one, or perhaps an ???and then??? combination. The
>> language of the second option sounds a bit weird to me???
> 
> The user almost certainly didn't 'forget to pull' in this case, as they
> probably didn't know there were remote csets to pull. So 'you may need
> to' is probably more appropriate here.
> 
> 'Forget' remains appropriate for the other case, it reminds the user
> that they'll probably want to pay attention to the earlier "you may
> want to merge" message.

How about:

"(you may need to pull and merge. use push -f to force)" then? timeless?

-- 
Kind regards,
  Henrik Stuart