[PATCH 6 of 6] Disable premerge by default

[Mads Kiilerich]

Matt Mackall wrote, On 09/18/2008 12:24 AM:
> It certainly is Mercurial-ish. Doing automatic premerge with a
> simplemerge-like tool has been the default since day one. The only thing
> that's changed is we don't call an external tool to do it.
>
> And it's also perfectly safe provided you check in your code before
> merging. 

I assume that check in before merge doesn't influence the automatic 
merge directly. Merging of checked in revisions gives safety because you 
always can and should review any merges before checkin, comparing them 
to both parents, and in case of any problems you can redo the merge?

> You might get the wrong merge result, but that danger can't be
> eliminated.
>   

http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram has for two 
years said: "It should be emphasized that Mercurial by itself doesn't 
attempt to do a merge at the file level, neither does it make any 
attempt to resolve the conflicts."

How should it be said instead? What can people expect? Which 
"guarantees" should be given?

/Mads
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 3435 bytes
Desc: S/MIME Cryptographic Signature
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20080918/64025177/attachment.bin