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

[Henrik Stuart]

timeless wrote:
> On Mon, Nov 23, 2009 at 9:32 PM, Henrik Stuart <hg at hstuart.dk> wrote:
>> How about:
>>
>> "(you may need to pull and merge. use push -f to force)" then? timeless?
> 
> i should check to see what i have today. i think i got distracted when
> i realized how annoying the second half of the message was.
> 
> offhand, the 'may' part is mostly wrong, it's more:
> 
> 'you should pull and merge' <conjunction> 'if you don't want to do
> this, you could force using push -f'
> 
> but figuring out how to reduce the number of words in the second half
> kinda sidetracked me.

It really depends greatly on your workflow whether it should be "should"
or "may", in my opinion. There could be instances, e.g. pushing a new
named branch, where you should definitely not pull and merge, but rather
just push -f.

-- 
Kind regards,
  Henrik Stuart