From owner-cvs-all Sun Aug 30 20:03:02 1998 Return-Path: Received: (from daemon@localhost) by hub.freebsd.org (8.8.8/8.8.8) id UAA11570 for cvs-all-outgoing; Sun, 30 Aug 1998 20:03:02 -0700 (PDT) (envelope-from owner-cvs-all) Received: from khavrinen.lcs.mit.edu (khavrinen.lcs.mit.edu [18.24.4.193]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id UAA11564 for ; Sun, 30 Aug 1998 20:02:52 -0700 (PDT) (envelope-from wollman@khavrinen.lcs.mit.edu) Received: (from wollman@localhost) by khavrinen.lcs.mit.edu (8.9.1/8.9.1) id XAA24265; Sun, 30 Aug 1998 23:01:45 -0400 (EDT) (envelope-from wollman) Date: Sun, 30 Aug 1998 23:01:45 -0400 (EDT) From: Garrett Wollman Message-Id: <199808310301.XAA24265@khavrinen.lcs.mit.edu> To: John Polstra Cc: committers@FreeBSD.ORG Subject: Re: make.conf In-Reply-To: <199808290518.WAA14604@austin.polstra.com> References: <199808281849.SAA06317@dingo.cdrom.com> <199808290518.WAA14604@austin.polstra.com> Sender: owner-cvs-all@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk < said: Sorry for joining the discussion a couple of days late... > You can get a poor man's version of this if you keep a CVS repository > around. Simply edit the files your checked-out source tree, and then > copy them into /etc. To merge, all you have to do is a "cvs update". > CVS does the same diff3 operation that I described above. One thing which would be a very good thing would be to copy Digital UNIX and keep a ``hidden'' as-it-was-installed copy of each configuration files. They actually have an automated tool that you can run which uses this (and diff3) to merge config files after an OS update. (But note that their /etc/rc.config has NO text in it -- it's just a sequence of shell variable definitions. It's not intended to be a user-serviceable part, which makes upgrading much easier.) -GAWollman -- Garrett A. Wollman | O Siem / We are all family / O Siem / We're all the same wollman@lcs.mit.edu | O Siem / The fires of freedom Opinions not those of| Dance in the burning flame MIT, LCS, CRS, or NSA| - Susan Aglukark and Chad Irschick