From owner-cvs-all  Sat Aug 29 00:22:36 1998
Return-Path: <owner-cvs-all>
Received: (from daemon@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id AAA25079
          for cvs-all-outgoing; Sat, 29 Aug 1998 00:22:36 -0700 (PDT)
          (envelope-from owner-cvs-all)
Received: from time.cdrom.com (time.cdrom.com [204.216.27.226])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id AAA25070
          for <committers@FreeBSD.ORG>; Sat, 29 Aug 1998 00:22:27 -0700 (PDT)
          (envelope-from jkh@time.cdrom.com)
Received: from time.cdrom.com (jkh@localhost.cdrom.com [127.0.0.1])
	by time.cdrom.com (8.8.8/8.8.8) with ESMTP id AAA24697;
	Sat, 29 Aug 1998 00:21:36 -0700 (PDT)
	(envelope-from jkh@time.cdrom.com)
To: John Polstra <jdp@polstra.com>
cc: committers@FreeBSD.ORG
Subject: Re: make.conf 
In-reply-to: Your message of "Fri, 28 Aug 1998 22:18:09 PDT."
             <199808290518.WAA14604@austin.polstra.com> 
Date: Sat, 29 Aug 1998 00:21:36 -0700
Message-ID: <24693.904375296@time.cdrom.com>
From: "Jordan K. Hubbard" <jkh@time.cdrom.com>
Sender: owner-cvs-all@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

>     diff3 -m MINE OLDER YOURS > NEW

So you're implying that OLDER will be created when:

   A) The system is first installed, perhaps by preserving the
      "base" rc.conf as /etc/rc.conf.dist

   B) One of these fancy[er] merges has been done, in which case
      /etc/rc.conf.dist is overwritten with the base rc.conf file
      from the new release.

I think that would be pretty darn simple - any objections to this
as a "quick fix" solution?  I'm still in favor of pushing people
over to rc.conf.local for their customizations (which, *ack urgh*,
doesn't even really need to live in /etc :-) but this would deal
reasonably well with those who didn't.

- Jordan