From owner-freebsd-current Mon Sep 23 17:11:17 1996 Return-Path: owner-current Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id RAA15500 for current-outgoing; Mon, 23 Sep 1996 17:11:17 -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 RAA15467 for ; Mon, 23 Sep 1996 17:11:13 -0700 (PDT) Received: from austin.polstra.com (jdp@localhost) by austin.polstra.com (8.7.5/8.7.3) with ESMTP id RAA13513; Mon, 23 Sep 1996 17:11:06 -0700 (PDT) Message-Id: <199609240011.RAA13513@austin.polstra.com> To: Warner Losh Cc: current@freebsd.org Subject: Re: Upgrading rc files + CTM outage? In-reply-to: <199609220646.AAA00334@rover.village.org> Date: Mon, 23 Sep 1996 17:11:05 -0700 From: John Polstra Sender: owner-current@freebsd.org X-Loop: FreeBSD.org Precedence: bulk > After fighting a little with the upgrade procedure, and finally > taking the time to upgrade the rc files, I was wondering if there > was a painless way to merge in the current /etc/sysconfig file one > might have with the newer ones that defines more things. "cvs update" works pretty well for this sort of thing. First, figure out which version of /etc/sysconfig you started with, by doing "ident /etc/sysconfig". For concreteness, let's say it was version 1.40. Get into an empty working directory, and check out that version: mkdir work cd work cvs co -d . -r 1.40 src/etc/sysconfig Now copy your real (locally-modified) file on top of that: cp /etc/sysconfig . Merge in the changes between your starting version and the current one: cvs update -A CVS will perform the merge, and will warn you if there are any conflicts. You can use "cvs diff" to see your local modifications, as applied to the current version of the file. Edit the file and get rid of any conflicts. When you are satisfied with the result, copy the file back into /etc. For a single file, "diff3 -m" may be an easier way to do this. John -- John Polstra jdp@polstra.com John D. Polstra & Co., Inc. Seattle, Washington USA "Self-knowledge is always bad news." -- John Barth