From owner-freebsd-stable Tue Feb 13 13:32:45 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 A918337B65D for ; Tue, 13 Feb 2001 13:32:40 -0800 (PST) Received: (qmail 6008 invoked by uid 1000); 13 Feb 2001 21:26:39 -0000 Received: from localhost (sendmail-bs@127.0.0.1) by localhost with SMTP; 13 Feb 2001 21:26:39 -0000 Date: Tue, 13 Feb 2001 13:26:39 -0800 (PST) From: Brian Behlendorf X-X-Sender: To: Kris Kennaway Cc: Greg Troxel , Subject: Re: sshd in 4.2-STABLE In-Reply-To: <20010213112727.C56175@mollari.cthul.hu> 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 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... Brian To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message