Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 Feb 2001 08:10:19 -0800 (PST)
From:      Brian Behlendorf <brian@collab.net>
To:        Greg Troxel <gdt@fnord.ir.bbn.com>
Cc:        <freebsd-stable@FreeBSD.ORG>
Subject:   Re: sshd in 4.2-STABLE
Message-ID:  <Pine.BSF.4.31.0102130807430.863-100000@localhost>
In-Reply-To: <rmilmrar9st.fsf@fnord.ir.bbn.com>

next in thread | previous in thread | raw e-mail | index | archive | help
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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.31.0102130807430.863-100000>