From owner-freebsd-stable@FreeBSD.ORG Fri Mar 13 00:25:04 2009 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 22E841065689 for ; Fri, 13 Mar 2009 00:25:04 +0000 (UTC) (envelope-from doconnor@gsoft.com.au) Received: from cain.gsoft.com.au (cain.gsoft.com.au [203.31.81.10]) by mx1.freebsd.org (Postfix) with ESMTP id 8B4148FC1A for ; Fri, 13 Mar 2009 00:25:03 +0000 (UTC) (envelope-from doconnor@gsoft.com.au) Received: from inchoate.localnet (Inchoate.gsoft.com.au [203.31.81.30]) (authenticated bits=0) by cain.gsoft.com.au (8.13.8/8.13.8) with ESMTP id n2D0OgKR066732 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 13 Mar 2009 10:54:42 +1030 (CST) (envelope-from doconnor@gsoft.com.au) From: "Daniel O'Connor" To: freebsd-stable@freebsd.org, antik@bsd.ee Date: Fri, 13 Mar 2009 10:54:33 +1030 User-Agent: KMail/1.10.4 (Linux/2.6.27-11-generic; KDE/4.1.4; i686; ; ) References: <200903121505.n2CF5RXx047734@lurza.secnetix.de> In-Reply-To: <200903121505.n2CF5RXx047734@lurza.secnetix.de> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1757167.ATj9rlvmg7"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200903131054.40000.doconnor@gsoft.com.au> X-Spam-Score: -3.977 () ALL_TRUSTED,BAYES_00 X-Scanned-By: MIMEDefang 2.63 on 203.31.81.10 Cc: Subject: Re: mergemaster annoyance or not? X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2009 00:25:04 -0000 --nextPart1757167.ATj9rlvmg7 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Friday 13 March 2009 01:35:27 Oliver Fromme wrote: > PS: I think the above options should _not_ be on by > default, because that would be a POLA violation. > Those people who want them can easily add them to their > mergemaster.rc file. Perhaps they should be suggested in the man page.. I agree it's a POLA violation, but it is rather annoying they can't be made= =20 the default as it is very much more pleasant to use with those options - th= e=20 defaults can be a recipe for either extreme tedium, or errors depending on = how=20 patient you are :) I wonder how hard it would be to add 3 way merging (like sysutils/etcmerge)= to=20 mergemaster.. =2D-=20 Daniel O'Connor software and network engineer for Genesis Software - http://www.gsoft.com.au "The nice thing about standards is that there are so many of them to choose from." -- Andrew Tanenbaum GPG Fingerprint - 5596 B766 97C0 0E94 4347 295E E593 DC20 7B3F CE8C --nextPart1757167.ATj9rlvmg7 Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iD8DBQBJuafC5ZPcIHs/zowRAm3qAJ47wZGnVjg/+M8zECMIU8HKDVq0ZACfTKQT 9EweZwFCiSwnmgQti0EJf/4= =mzm9 -----END PGP SIGNATURE----- --nextPart1757167.ATj9rlvmg7--