Date: Wed, 28 Nov 2007 20:45:26 +1030 From: "Daniel O'Connor" <doconnor@gsoft.com.au> To: freebsd-current@freebsd.org Cc: Giorgos Keramidas <keramida@ceid.upatras.gr>, "Aryeh M. Friedman" <aryeh.friedman@gmail.com> Subject: Re: idea bouncing: using cvs as a replacement for mergemaster Message-ID: <200711282045.27679.doconnor@gsoft.com.au> In-Reply-To: <20071128085732.GA2276@kobe.laptop> References: <474CE455.6070603@gmail.com> <20071128085732.GA2276@kobe.laptop>
next in thread | previous in thread | raw e-mail | index | archive | help
--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" <aryeh.friedman@gmail.com>=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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711282045.27679.doconnor>