Date: Wed, 28 Nov 2007 13:16:26 -0800 From: "Kevin Oberman" <oberman@es.net> To: "Daniel O'Connor" <doconnor@gsoft.com.au> Cc: Giorgos Keramidas <keramida@ceid.upatras.gr>, freebsd-current@freebsd.org, "Aryeh M. Friedman" <aryeh.friedman@gmail.com> Subject: Re: idea bouncing: using cvs as a replacement for mergemaster Message-ID: <20071128211626.0BB084500E@ptavv.es.net> In-Reply-To: Your message of "Wed, 28 Nov 2007 20:45:26 %2B1030." <200711282045.27679.doconnor@gsoft.com.au>
next in thread | previous in thread | raw e-mail | index | archive | help
--==_Exmh_1196284586_79257P Content-Type: text/plain; charset=us-ascii Content-Disposition: inline > From: "Daniel O'Connor" <doconnor@gsoft.com.au> > 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" <aryeh.friedman@gmail.com> > 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071128211626.0BB084500E>