From owner-cvs-all@FreeBSD.ORG  Sat Oct  9 16:51:21 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id C070F16A4CE; Sat,  9 Oct 2004 16:51:21 +0000 (GMT)
Received: from srv01.sparkit.no (srv01.sparkit.no [193.69.116.226])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 2B45843D49; Sat,  9 Oct 2004 16:51:21 +0000 (GMT)
	(envelope-from eivind@FreeBSD.org)
Received: from ws.nada ([193.69.114.88])
	by srv01.sparkit.no (8.12.11/8.12.11) with ESMTP id i99Gp22W051361;
	Sat, 9 Oct 2004 18:51:02 +0200 (CEST)
	(envelope-from eivind@FreeBSD.org)
Received: from ws.nada (localhost [127.0.0.1])
	by ws.nada (8.12.9/8.12.10) with ESMTP id i99GkeEt001868;
	Sat, 9 Oct 2004 16:46:40 GMT
	(envelope-from eivind@ws.nada)
Received: (from eivind@localhost)
	by ws.nada (8.12.9/8.12.10/Submit) id i99GkeDH001867;
	Sat, 9 Oct 2004 16:46:40 GMT
	(envelope-from eivind)
Date: Sat, 9 Oct 2004 16:46:39 +0000
From: Eivind Eklund <eivind@FreeBSD.org>
To: Brian Somers <brian@Awfulhak.org>
Message-ID: <20041009164639.GA1737@FreeBSD.org>
References: <200410071355.i97DtSJq024575@repoman.freebsd.org>
	<20041009011553.01708de1@dev.lan.Awfulhak.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20041009011553.01708de1@dev.lan.Awfulhak.org>
User-Agent: Mutt/1.5.4i
cc: cvs-src@FreeBSD.org
cc: Mike Makonnen <mtm@FreeBSD.org>
cc: src-committers@FreeBSD.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 ...)
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Oct 2004 16:51:21 -0000

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.