From owner-freebsd-current  Mon Sep 23 19:20:54 1996
Return-Path: owner-current
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id TAA06245
          for current-outgoing; Mon, 23 Sep 1996 19:20:54 -0700 (PDT)
Received: from austin.polstra.com (austin.polstra.com [206.213.73.10])
          by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id TAA06201
          for <current@freebsd.org>; Mon, 23 Sep 1996 19:20:47 -0700 (PDT)
Received: from austin.polstra.com (jdp@localhost) by austin.polstra.com (8.7.5/8.7.3) with ESMTP id TAA15613; Mon, 23 Sep 1996 19:20:21 -0700 (PDT)
Message-Id: <199609240220.TAA15613@austin.polstra.com>
To: "Jordan K. Hubbard" <jkh@time.cdrom.com>
cc: Warner Losh <imp@village.org>, current@freebsd.org
Subject: Re: Upgrading rc files + CTM outage? 
In-reply-to: Your message of "Mon, 23 Sep 1996 18:47:10 PDT."
             <2384.843529630@time.cdrom.com> 
Date: Mon, 23 Sep 1996 19:20:21 -0700
From: John Polstra <jdp@polstra.com>
Sender: owner-current@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

> > "cvs update" works pretty well for this sort of thing.  First,
> > ...
>
> Huh!  I wonder if putting the CVS repository on a CD would let
> me use something like this technique for upgrading /etc. ;-)

Ignoring your winky-face ... Actually, I think that's a good idea.
You wouldn't need the whole repository, of course -- just a
mini-repository containing the /etc files.

If you didn't want to or couldn't use a CVS repository, you could
include just the necessary RCS files.  It would be easy to put
together a shell script to do the merging, using "diff3 -m".

John