From owner-freebsd-stable@FreeBSD.ORG Fri Mar 13 09:01:33 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 96419106564A for ; Fri, 13 Mar 2009 09:01:33 +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 DAA9D8FC13 for ; Fri, 13 Mar 2009 09:01:32 +0000 (UTC) (envelope-from doconnor@gsoft.com.au) Received: from inchoate.localnet (ppp121-45-189-13.lns11.adl2.internode.on.net [121.45.189.13]) (authenticated bits=0) by cain.gsoft.com.au (8.13.8/8.13.8) with ESMTP id n2D91U2c089049 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 13 Mar 2009 19:31:30 +1030 (CST) (envelope-from doconnor@gsoft.com.au) From: "Daniel O'Connor" To: perryh@pluto.rain.com Date: Fri, 13 Mar 2009 19:31:28 +1030 User-Agent: KMail/1.10.4 (Linux/2.6.27-11-generic; KDE/4.1.4; i686; ; ) References: <200903121505.n2CF5RXx047734@lurza.secnetix.de> <200903131054.40000.doconnor@gsoft.com.au> <49ba0a99.zRpbA1XAX3ZA0YOG%perryh@pluto.rain.com> In-Reply-To: <49ba0a99.zRpbA1XAX3ZA0YOG%perryh@pluto.rain.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1281534.QTThvKnA5d"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200903131931.28854.doconnor@gsoft.com.au> X-Spam-Score: -2.212 () BAYES_00,RDNS_DYNAMIC X-Scanned-By: MIMEDefang 2.63 on 203.31.81.10 Cc: freebsd-stable@freebsd.org 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 09:01:34 -0000 --nextPart1281534.QTThvKnA5d Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Friday 13 March 2009 17:56:17 perryh@pluto.rain.com wrote: > "Daniel O'Connor" wrote: > > I wonder how hard it would be to add 3 way merging (like > > sysutils/etcmerge) to mergemaster.. > > One complication: to do a 3-way merge you have to have the common > ancestor. To ensure the initial availability of such would require > some infrastructure which AFAIK does not currently exist: > > * A standardized place to keep the original contents of /etc -- > /origEtc or /etc- anyone? etcmerge keeps it in /var/db/etc > * A way to ensure that installation populates that place with > the needed redundant copy of the bits, either by including the > additional instance within the distributions or by generating > it in the course of installation. The former would likely be > easier, if only because the latter would need to work for all > installation methods. IMO it is OK to fall back to a 2 way diff if it doesn't exist (ie the first= =20 time you run it) =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 --nextPart1281534.QTThvKnA5d 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) iD8DBQBJuiDo5ZPcIHs/zowRAtq1AJ9+ArynZrzBsiV0BnzMbdgZxYdijgCfeYss 1yssin2Plc0FrDRhR7ZrG9o= =bu9+ -----END PGP SIGNATURE----- --nextPart1281534.QTThvKnA5d--