Date: Sat, 9 Oct 2004 16:46:39 +0000 From: Eivind Eklund <eivind@FreeBSD.org> To: Brian Somers <brian@Awfulhak.org> Cc: cvs-all@FreeBSD.org Subject: Re: What we keep under /etc (was: cvs commit: src/etc rc rc.shutdown src/etc/rc.d ...) Message-ID: <20041009164639.GA1737@FreeBSD.org> In-Reply-To: <20041009011553.01708de1@dev.lan.Awfulhak.org> References: <200410071355.i97DtSJq024575@repoman.freebsd.org> <20041009011553.01708de1@dev.lan.Awfulhak.org>
index | next in thread | previous in thread | raw e-mail
On Sat, Oct 09, 2004 at 01:15:53AM +0100, Brian Somers wrote: > This makes life painful enough to ask.... > > Is there any good reason that mergemaster deals with this stuff rather than > make installworld? Or maybe I should ask, why doesn't make installworld > handle *some* stuff in /etc, such as /etc/rc.d/ and /etc/defaults/? In my opinion, this is a result *only* of mergemaster being broken. A two-way merge has significant problems for anything with two-directional modifications. Modifying our install policy because mergemaster is broken is in my opinion inappropriate. I tried to fix mergemaster, but over a couple of years Doug never found time to look over and accept or reject my patches, so I gave up bugging him about it and wrote a replacement. That replacement is available in /usr/ports/sysutils/etcmerge. etcmerge does not suffer from the problems of mergemaster, and I'd be unhappy to see its users suffer because of deficiencies in mergemaster. Eivind.home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041009164639.GA1737>