From owner-freebsd-current@FreeBSD.ORG Wed Nov 28 21:16:40 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 235DB16A417 for ; Wed, 28 Nov 2007 21:16:40 +0000 (UTC) (envelope-from SRS0=bd90c2661706f407db3bee4462dd5865f2f2a731=533=es.net=oberman@es.net) Received: from postal1.es.net (postal1.es.net [IPv6:2001:400:14:3::6]) by mx1.freebsd.org (Postfix) with ESMTP id 98DBD13C46A for ; Wed, 28 Nov 2007 21:16:39 +0000 (UTC) (envelope-from SRS0=bd90c2661706f407db3bee4462dd5865f2f2a731=533=es.net=oberman@es.net) Received: from ptavv.es.net (ptavv.es.net [198.128.4.29]) by postal1.es.net (Postal Node 1) with ESMTP (SSL) id HGS18726; Wed, 28 Nov 2007 13:16:26 -0800 Received: from ptavv.es.net (ptavv.es.net [127.0.0.1]) by ptavv.es.net (Tachyon Server) with ESMTP id 0BB084500E; Wed, 28 Nov 2007 13:16:26 -0800 (PST) To: "Daniel O'Connor" In-Reply-To: Your message of "Wed, 28 Nov 2007 20:45:26 +1030." <200711282045.27679.doconnor@gsoft.com.au> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==_Exmh_1196284586_79257P"; micalg=pgp-sha1; protocol="application/pgp-signature" Content-Transfer-Encoding: 7bit Date: Wed, 28 Nov 2007 13:16:26 -0800 From: "Kevin Oberman" Message-Id: <20071128211626.0BB084500E@ptavv.es.net> X-Sender-IP: 198.128.4.29 X-Sender-Domain: es.net X-Recipent: ; ; ; ; X-Sender: X-To_Name: Daniel O'Connor X-To_Domain: gsoft.com.au X-To: "Daniel O'Connor" X-To_Email: doconnor@gsoft.com.au X-To_Alias: doconnor Cc: Giorgos Keramidas , freebsd-current@freebsd.org, "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 21:16:40 -0000 --==_Exmh_1196284586_79257P Content-Type: text/plain; charset=us-ascii Content-Disposition: inline > From: "Daniel O'Connor" > Date: Wed, 28 Nov 2007 20:45:26 +1030 > Sender: owner-freebsd-current@freebsd.org > > On Wed, 28 Nov 2007, Giorgos Keramidas wrote: > > On 2007-11-27 22:45, "Aryeh M. Friedman" > 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 > painless.. It does need to be taught to special case certain files tho > (ie all of the ones derived from others like spwd.db, aliases.db, etc) > but apart from that it is very nice. > > It is a port - sysutils/etcmerge. Another simple solution, which needs more publicity, is 'mergemaster -U'. I do my updates using -Ui and seldom have to deal any manual merge. It's not perfect as I still need to deal with locally modified files, but "it's good enough". -- R. Kevin Oberman, Network Engineer Energy Sciences Network (ESnet) Ernest O. Lawrence Berkeley National Laboratory (Berkeley Lab) E-mail: oberman@es.net Phone: +1 510 486-8634 Key fingerprint:059B 2DDF 031C 9BA3 14A4 EADA 927D EBB3 987B 3751 --==_Exmh_1196284586_79257P Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (FreeBSD) Comment: Exmh version 2.5 06/03/2002 iD8DBQFHTdqqkn3rs5h7N1ERAufKAKCzsCjMgzRGajoc8lOTQ2EDbqV5EQCggsIF isC36ws8AukzGZNS/jvQbFg= =NUom -----END PGP SIGNATURE----- --==_Exmh_1196284586_79257P--