From owner-freebsd-current@FreeBSD.ORG Wed Nov 28 10:15:39 2007 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 72EDD16A4A0 for ; Wed, 28 Nov 2007 10:15:39 +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 C0B5813C4CE for ; Wed, 28 Nov 2007 10:15:38 +0000 (UTC) (envelope-from doconnor@gsoft.com.au) Received: from inchoate.gsoft.com.au (ppp121-45-33-194.lns10.adl2.internode.on.net [121.45.33.194]) (authenticated bits=0) by cain.gsoft.com.au (8.13.8/8.13.8) with ESMTP id lASAFVxg043520 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 28 Nov 2007 20:45:31 +1030 (CST) (envelope-from doconnor@gsoft.com.au) From: "Daniel O'Connor" To: freebsd-current@freebsd.org Date: Wed, 28 Nov 2007 20:45:26 +1030 User-Agent: KMail/1.9.7 References: <474CE455.6070603@gmail.com> <20071128085732.GA2276@kobe.laptop> In-Reply-To: <20071128085732.GA2276@kobe.laptop> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1590209.lBmIjpfN1e"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200711282045.27679.doconnor@gsoft.com.au> X-Spam-Score: -2.312 () BAYES_00 X-Scanned-By: MIMEDefang 2.58 on 203.31.81.10 Cc: Giorgos Keramidas , "Aryeh M. Friedman" Subject: Re: idea bouncing: using cvs as a replacement for mergemaster X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Nov 2007 10:15:39 -0000 --nextPart1590209.lBmIjpfN1e Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Wed, 28 Nov 2007, Giorgos Keramidas wrote: > On 2007-11-27 22:45, "Aryeh M. Friedman" =20 wrote: > > I was thinking seeing the fact that I already have a cvs repo of > > - -current does it make sense to just use CVS to update /etc > > instead of mergemaster... if so any ideas on doing it cleanly? > > It may work, but it doesn't ``scale'' to dozens of machines, and you > still have to do merging when upstream files (the ones in the FreeBSD > repository) change. It's not particularly hard to merge with CVS, if > you consider the src/etc files of FreeBSD a ``vendor branch'', but > it's not exactly a fun ride either. etcmerge does a 3 way merge which makes most updates almost completely=20 painless.. It does need to be taught to special case certain files tho=20 (ie all of the ones derived from others like spwd.db, aliases.db, etc)=20 but apart from that it is very nice. It is a port - sysutils/etcmerge. =20 =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 --nextPart1590209.lBmIjpfN1e 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) iD8DBQBHTT+/5ZPcIHs/zowRAhYNAKCXn4UVuNLEptAgRdkwuP4q8/PNXgCcDXPQ pXoAIvFRo5bk1Udslex7rvg= =vFpq -----END PGP SIGNATURE----- --nextPart1590209.lBmIjpfN1e--