Date: Sat, 17 Nov 2007 11:15:58 +0100 From: Peter Schuller <peter.schuller@infidyne.com> To: freebsd-questions@freebsd.org Subject: sysutils/etcmerge vs mergemaster Message-ID: <200711171116.06705.peter.schuller@infidyne.com>
index | next in thread | raw e-mail
[-- Attachment #1 --] 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@infidyne.com>' Key retrieval: Send an E-Mail to getpgpkey@scode.org E-Mail: peter.schuller@infidyne.com Web: http://www.scode.org [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (FreeBSD) iD8DBQBHPr9mDNor2+l1i30RAk98AJ43N6xHhg74aJLQfYV1W/Q+lbRmGQCgh7eD qcznl3f2VlLMXIfNO8RW26g= =cCRd -----END PGP SIGNATURE-----home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711171116.06705.peter.schuller>