From owner-freebsd-stable Tue Feb 13 8: 9:41 2001 Delivered-To: freebsd-stable@freebsd.org Received: from yez.hyperreal.org (penelope.ny.collab.net [64.61.9.189]) by hub.freebsd.org (Postfix) with SMTP id 63B9F37B491 for ; Tue, 13 Feb 2001 08:09:39 -0800 (PST) Received: (qmail 3236 invoked by uid 1000); 13 Feb 2001 16:10:19 -0000 Received: from localhost (sendmail-bs@127.0.0.1) by localhost with SMTP; 13 Feb 2001 16:10:19 -0000 Date: Tue, 13 Feb 2001 08:10:19 -0800 (PST) From: Brian Behlendorf X-X-Sender: To: Greg Troxel Cc: Subject: Re: sshd in 4.2-STABLE In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On 13 Feb 2001, Greg Troxel wrote: > The Debian package system does something like this, and I found it > very helpful for the brief time I ran a GNU/Linux system. IIRC, > packages distinguished between regular files (that weren't expected to > change) and configuration files. When upgrading to a new version of a > package, the rule was that if a config file was unchanged (same md5) > from the installed package, it was replaced by the new version. If > changed, the user was asked to merge/cope. Also, config files were > left on pkg_delete (well, dpkg --remove), unless one asked to have > them removed. I have to agree - many of the changes mergemaster makes are to files that no one would recommend editing directly in regular use, like MAKEDEV and /etc/rc.network and all the stuff in /etc/defaults. Modifying mergemaster to only ask to merge files that have been changed sounds like a good idea to me... Brian To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message