From owner-freebsd-stable Wed Jun 14 20:54:18 2000 Delivered-To: freebsd-stable@freebsd.org Received: from thehousleys.net (frenchknot.ne.mediaone.net [24.147.224.201]) by hub.freebsd.org (Postfix) with ESMTP id 4176737B60F for ; Wed, 14 Jun 2000 20:54:16 -0700 (PDT) (envelope-from jim@thehousleys.net) Received: from thehousleys.net (baby.int.thehousleys.net. [192.168.0.24]) by thehousleys.net (8.9.3/8.9.3) with ESMTP id XAA09372; Wed, 14 Jun 2000 23:54:09 -0400 (EDT) (envelope-from jim@thehousleys.net) Message-ID: <3948535E.45E0F06F@thehousleys.net> Date: Wed, 14 Jun 2000 23:54:06 -0400 From: James Housley Organization: The Housleys dot Net X-Mailer: Mozilla 4.72 [en] (X11; U; FreeBSD 4.0-STABLE i386) X-Accept-Language: en MIME-Version: 1.0 To: "Sean O'Connell" , freebsd-stable@freebsd.org Subject: Re: How often to run mergemaster? References: <200006150312.XAA11324@sanson.reyes.somos.net> <20000614234019.B976@stat.Duke.EDU> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Sean O'Connell wrote: > > I run it when I notice that things have been changed in > /usr/src/etc from my cvsup logs. As a side-note, I became > frustrated with mergemaster asking me about a whole bunch > of files that I don't want it to touch. I filed a PR that > adds an IGNORE_LIST to the mergemaster script that is read > out of the .mergemasterrc. > One way I got around that is to merge the "$FreeBSD .... " version line over, since the standard mode just checks version strings. mergemaster -s will notice they are different. I hope this helps. Jim -- Artificial intelligence is no match for natural stupidity. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message