From owner-freebsd-stable Wed Feb 14 7:42:30 2001 Delivered-To: freebsd-stable@freebsd.org Received: from pan.ch.intel.com (chfdns01.ch.intel.com [143.182.246.24]) by hub.freebsd.org (Postfix) with ESMTP id CB7EB37B401 for ; Wed, 14 Feb 2001 07:42:27 -0800 (PST) Received: from sedona.intel.com (sedona.ch.intel.com [143.182.218.21]) by pan.ch.intel.com (8.9.1a+p1/8.9.1/d: relay.m4,v 1.35 2001/02/12 09:03:45 smothers Exp $) with ESMTP id PAA04137 for ; Wed, 14 Feb 2001 15:42:26 GMT Received: from hip186.ch.intel.com (hip186.ch.intel.com [143.182.225.68]) by sedona.intel.com (8.9.1a/8.9.1/d: sendmail.cf,v 1.14 2001/01/02 18:39:59 steved Exp $) with ESMTP id IAA18628 for ; Wed, 14 Feb 2001 08:42:26 -0700 (MST) X-Envelope-To: X-Envelope-From: jreynold@sedona.ch.intel.com Received: (from jreynold@localhost) by hip186.ch.intel.com (8.9.1a/8.9.1/d: client.m4,v 1.3 1998/09/29 16:36:11 sedayao Exp sedayao $) id KAA14757; Wed, 14 Feb 2001 10:42:26 -0500 (EST) X-Authentication-Warning: hip186.ch.intel.com: jreynold set sender to jreynold@sedona.ch.intel.com using -f From: John Reynolds~ MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <14986.42850.626368.28696@hip186.ch.intel.com> Date: Wed, 14 Feb 2001 08:42:26 -0700 (MST) To: freebsd-stable@freebsd.org Subject: Re: sshd in 4.2-STABLE In-Reply-To: <20010213192504.A61478@mollari.cthul.hu> References: <20010213112727.C56175@mollari.cthul.hu> <20010213192504.A61478@mollari.cthul.hu> X-Mailer: VM 6.75 under Emacs 20.7.2 Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG [ On Tuesday, February 13, Kris Kennaway wrote: ] > > 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 I have a local hack to mergemaster which goes in an removes certain files from the "tmproot" that I don't want mergemaster to screw with (named.conf, sendmail.cf, passwd, to name a few). I suppose you could do the same thing using the MM_PRE_COMPARE_SCRIPT variable--point that at a script which pre-nuked certain files. I meant to play with it last night, but got distracted with the Real World(tm) (not the MTV series ;-). -Jr -- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= | John Reynolds WCCG, CCE, Higher Levels of Abstraction | | Intel Corporation MS: CH6-210 Phone: 480-554-9092 pgr: 602-868-6512 | | jreynold@sedona.ch.intel.com http://www-aec.ch.intel.com/~jreynold/ | =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message