Date: Tue, 13 Feb 2001 11:27:27 -0800 From: Kris Kennaway <kris@obsecurity.org> To: Brian Behlendorf <brian@collab.net> Cc: Greg Troxel <gdt@fnord.ir.bbn.com>, freebsd-stable@FreeBSD.ORG Subject: Re: sshd in 4.2-STABLE Message-ID: <20010213112727.C56175@mollari.cthul.hu> In-Reply-To: <Pine.BSF.4.31.0102130807430.863-100000@localhost>; from brian@collab.net on Tue, Feb 13, 2001 at 08:10:19AM -0800 References: <rmilmrar9st.fsf@fnord.ir.bbn.com> <Pine.BSF.4.31.0102130807430.863-100000@localhost>
next in thread | previous in thread | raw e-mail | index | archive | help
--p2kqVDKq5asng8Dg Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Feb 13, 2001 at 08:10:19AM -0800, Brian Behlendorf wrote: > 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. >=20 > 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... Have you read the mergemaster docs? It can already do this. Kris --p2kqVDKq5asng8Dg Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.4 (FreeBSD) Comment: For info see http://www.gnupg.org iD8DBQE6iYqfWry0BWjoQKURAnEPAJ0SoB/FZyuozxIq4qP8vuYZShxvzACgwTKS sOdlQJnfkX4tgGYNSn0LoKo= =4gnB -----END PGP SIGNATURE----- --p2kqVDKq5asng8Dg-- 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?20010213112727.C56175>