idea bouncing: using cvs as a replacement for mergemaster

Daniel O'Connor doconnor at gsoft.com.au
Wed Nov 28 02:15:39 PST 2007


On Wed, 28 Nov 2007, Giorgos Keramidas wrote:
> On 2007-11-27 22:45, "Aryeh M. Friedman" <aryeh.friedman at 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.
 
-- 
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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: This is a digitally signed message part.
Url : http://lists.freebsd.org/pipermail/freebsd-current/attachments/20071128/80e2e144/attachment.pgp


More information about the freebsd-current mailing list