sysutils/etcmerge vs mergemaster

[Peter Schuller]

Hello,

etcmerge, with three-way merging, has been available for a while, but the man 
page still warns of it not being extensively tested, and of course 
mergermaster still seems to be the officially supported tool.

In spite of this, etcmerge is attractive since, to be honest, manually 
saying "yes update" to a bunch of files that mostly have only CVS revision 
changes is a waste of time. (In addition even files with local changes would 
be easier to handle with etcmerge)

Given the obvious benefit to etcmerge's fundamental algorithm I have to wonder 
why it does not seem to be more wide spread in use. Are there problems with 
it that I don't know about? How many people use it in production? Are there 
advantages to mergemaster that causes mergemaster to even be preferred over 
etcmerge as the default tool in base?

-- 
/ Peter Schuller

PGP userID: 0xE9758B7D or 'Peter Schuller <peter.schuller at infidyne.com>'
Key retrieval: Send an E-Mail to getpgpkey at scode.org
E-Mail: peter.schuller at infidyne.com Web: http://www.scode.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: This is a digitally signed message part.
Url : http://lists.freebsd.org/pipermail/freebsd-questions/attachments/20071117/c30319d6/attachment.pgp