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

[timeless]

On Mon, Nov 23, 2009 at 10:32 PM, Henrik Stuart <hg at hstuart.dk> wrote:
> 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.

that 'should' be covered by the alternative bit which needs to be rewritten.

you have two choices:
pull + merge
ignore it and use force/newbranch

but the instructions for pull + merge should be strong, the
alternative is "or if you don't want to do this, you can do something
else".