From owner-cvs-all  Sat Aug 29 07:39:39 1998
Return-Path: <owner-cvs-all>
Received: (from daemon@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id HAA01255
          for cvs-all-outgoing; Sat, 29 Aug 1998 07:39:39 -0700 (PDT)
          (envelope-from owner-cvs-all)
Received: from austin.polstra.com (austin.polstra.com [206.213.73.10])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id HAA01250
          for <committers@FreeBSD.ORG>; Sat, 29 Aug 1998 07:39:35 -0700 (PDT)
          (envelope-from jdp@austin.polstra.com)
Received: from austin.polstra.com (jdp@localhost)
	by austin.polstra.com (8.8.8/8.8.8) with ESMTP id HAA21025;
	Sat, 29 Aug 1998 07:38:37 -0700 (PDT)
	(envelope-from jdp)
Message-Id: <199808291438.HAA21025@austin.polstra.com>
To: "Jordan K. Hubbard" <jkh@time.cdrom.com>
cc: committers@FreeBSD.ORG
Subject: Re: make.conf 
In-reply-to: Your message of "Sat, 29 Aug 1998 00:21:36 PDT."
    <24693.904375296@time.cdrom.com> 
Date: Sat, 29 Aug 1998 07:38:36 -0700
From: John Polstra <jdp@polstra.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.

Yes, exactly.

Joerg also had an idea for deducing the original (OLDER) file on
"unknown" systems using md5 checksums, but it's too early in the
morning to reconstruct it right now.  Also, if all the important files
had RCS $Id$ (or $FreeBSD$) keywords, then the revision number of
OLDER could be determined from those.

John