Feature: merge operation to merge against only other non-parent head when no rev given

[Douglas Philips]

On 2010 May 7, at 3:33 PM, Matt Mackall wrote:
> Really. I'm working on the stable branch, habitually type merge before
> trying to push, habitually type commit when the merge succeeds as
> expected, push two changesets, and don't know I've dumped the entire
> development branch into stable until my boss is at my door with the  
> rest
> of the development team standing behind him to watch the show.

Well, I guess you have such perfect code that you don't test it before  
just merging?
How many times have you and this list reminded folks that Hg does - 
not- understand what a merge actually means, and that there is -no-  
guarantee that even a successful merge will work or make sense.

With that kind of work attitude, your boss is at your door for  
stupider things; breaking the build regularly because you don't bother  
to pay attention to what you were doing, or for testing it... Sheesh,  
this is such a lame example. If you don't like this, be honest say so,  
but don't give bad advice (blindly merging and pushing) as your excuse.

-Doug