From owner-freebsd-current  Mon Sep 23 19:42:31 1996
Return-Path: owner-current
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id TAA14060
          for current-outgoing; Mon, 23 Sep 1996 19:42:31 -0700 (PDT)
Received: from agora.rdrop.com (root@agora.rdrop.com [199.2.210.241])
          by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id TAA13689
          for <current@freebsd.org>; Mon, 23 Sep 1996 19:40:58 -0700 (PDT)
Received: from rover.village.org by agora.rdrop.com with smtp
	(Smail3.1.29.1 #17) id m0v5NQa-0008yPC; Mon, 23 Sep 96 19:40 PDT
Received: from rover.village.org (localhost [127.0.0.1]) by rover.village.org (8.7.6/8.6.6) with ESMTP id UAA03789; Mon, 23 Sep 1996 20:33:13 -0600 (MDT)
Message-Id: <199609240233.UAA03789@rover.village.org>
To: John Polstra <jdp@polstra.com>
Subject: Re: Upgrading rc files + CTM outage? 
Cc: "Jordan K. Hubbard" <jkh@time.cdrom.com>, current@freebsd.org
In-reply-to: Your message of "Mon, 23 Sep 1996 19:20:21 PDT."
		<199609240220.TAA15613@austin.polstra.com> 
References: <199609240220.TAA15613@austin.polstra.com>  
Date: Mon, 23 Sep 1996 20:33:13 -0600
From: Warner Losh <imp@village.org>
Sender: owner-current@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

In message <199609240220.TAA15613@austin.polstra.com> John Polstra writes:
: 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".

I was kinda thinking for this particular file of doing the "write a
shell command to write a sed script to take the current values and
smash them into the new "template"" trick.  However, a diff3 might
work as well...

Warner