Date: Tue, 13 Feb 2001 19:25:04 -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: <20010213192504.A61478@mollari.cthul.hu> In-Reply-To: <Pine.BSF.4.31.0102131320500.863-100000@localhost>; from brian@collab.net on Tue, Feb 13, 2001 at 01:26:39PM -0800 References: <20010213112727.C56175@mollari.cthul.hu> <Pine.BSF.4.31.0102131320500.863-100000@localhost>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Tue, Feb 13, 2001 at 01:26:39PM -0800, Brian Behlendorf wrote: > On Tue, 13 Feb 2001, Kris Kennaway wrote: > > On Tue, Feb 13, 2001 at 08:10:19AM -0800, Brian Behlendorf wrote: > > > 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. > > Er, how? You mean the MM_PRE_COMPARE_SCRIPT and MM_EXIT_SCRIPT script > hooks? It's been a long week and is only Tuesday, but I must be missing > something... Actually, I think I was wrong (I was thinking of the option to merge based on diffs). Still, talk to Doug about the suggestion. Kris [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.4 (FreeBSD) Comment: For info see http://www.gnupg.org iD8DBQE6ifqPWry0BWjoQKURAl/hAJ9zp3TrmU1b2yLYI5yiEoIFzM3faQCfUyi4 WnrMkAoZVGlyU9BSAdF/vFo= =WF6+ -----END PGP SIGNATURE-----help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010213192504.A61478>