From owner-freebsd-questions@FreeBSD.ORG Sat Nov 17 10:30:49 2007 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2AAAC16A419 for ; Sat, 17 Nov 2007 10:30:49 +0000 (UTC) (envelope-from peter.schuller@infidyne.com) Received: from smtp.infidyne.com (ds9.infidyne.com [88.80.6.206]) by mx1.freebsd.org (Postfix) with ESMTP id DD06813C448 for ; Sat, 17 Nov 2007 10:30:48 +0000 (UTC) (envelope-from peter.schuller@infidyne.com) Received: from c-5416e555.03-51-73746f3.cust.bredbandsbolaget.se (c-5416e555.03-51-73746f3.cust.bredbandsbolaget.se [85.229.22.84]) by smtp.infidyne.com (Postfix) with ESMTP id 18F16728CC for ; Sat, 17 Nov 2007 11:14:20 +0100 (CET) From: Peter Schuller To: freebsd-questions@freebsd.org Date: Sat, 17 Nov 2007 11:15:58 +0100 User-Agent: KMail/1.9.7 MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1322385.lVyvA3lGPi"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200711171116.06705.peter.schuller@infidyne.com> Subject: sysutils/etcmerge vs mergemaster X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 10:30:49 -0000 --nextPart1322385.lVyvA3lGPi Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hello, etcmerge, with three-way merging, has been available for a while, but the m= an=20 page still warns of it not being extensively tested, and of course=20 mergermaster still seems to be the officially supported tool. In spite of this, etcmerge is attractive since, to be honest, manually=20 saying "yes update" to a bunch of files that mostly have only CVS revision= =20 changes is a waste of time. (In addition even files with local changes woul= d=20 be easier to handle with etcmerge) Given the obvious benefit to etcmerge's fundamental algorithm I have to won= der=20 why it does not seem to be more wide spread in use. Are there problems with= =20 it that I don't know about? How many people use it in production? Are there= =20 advantages to mergemaster that causes mergemaster to even be preferred over= =20 etcmerge as the default tool in base? =2D-=20 / Peter Schuller PGP userID: 0xE9758B7D or 'Peter Schuller ' Key retrieval: Send an E-Mail to getpgpkey@scode.org E-Mail: peter.schuller@infidyne.com Web: http://www.scode.org --nextPart1322385.lVyvA3lGPi Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (FreeBSD) iD8DBQBHPr9mDNor2+l1i30RAk98AJ43N6xHhg74aJLQfYV1W/Q+lbRmGQCgh7eD qcznl3f2VlLMXIfNO8RW26g= =cCRd -----END PGP SIGNATURE----- --nextPart1322385.lVyvA3lGPi--