From owner-freebsd-stable@FreeBSD.ORG Fri Mar 13 04:55:07 2009 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 59530106566C for ; Fri, 13 Mar 2009 04:55:07 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx22.fluidhosting.com [204.14.89.5]) by mx1.freebsd.org (Postfix) with ESMTP id DD3748FC14 for ; Fri, 13 Mar 2009 04:55:06 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 17985 invoked by uid 399); 13 Mar 2009 04:55:05 -0000 Received: from localhost (HELO lap.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 13 Mar 2009 04:55:05 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <49B9E727.3070609@FreeBSD.org> Date: Thu, 12 Mar 2009 21:55:03 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.19 (X11/20090312) MIME-Version: 1.0 To: Eugene Grosbein References: <49B8AB66.9080408@bsd.ee> <200903121505.n2CF5RXx047734@lurza.secnetix.de> <20090313041825.GA56699@svzserv.kemerovo.su> In-Reply-To: <20090313041825.GA56699@svzserv.kemerovo.su> X-Enigmail-Version: 0.95.7 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: antik@bsd.ee, freebsd-stable@freebsd.org Subject: Re: mergemaster annoyance or not? X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2009 04:55:07 -0000 Eugene Grosbein wrote: > On Thu, Mar 12, 2009 at 04:05:27PM +0100, Oliver Fromme wrote: > >> This is what I have in my /etc/mergemaster.rc; it will >> probably help in your case: >> >> DIFF_FLAG='-Bub' >> DIFF_OPTIONS='-I$FreeBSD:.*[$]' >> IGNORE_MOTD=yes Newer versions of mergemaster prefer the following: IGNORE_FILES='/etc/motd' Other files can be added to that list as desired. > Yes, it helps and I like it. But I'm forced to put it to each and every > box I install; that does not annoy me so much > but other people are annoyed. There is no reason to install this permanently. You can use this option the first time you upgrade, then use the -U option subsequently. >> PS: I think the above options should _not_ be on by >> default, because that would be a POLA violation. >> Those people who want them can easily add them to their >> mergemaster.rc file. > > I see this as POLA recovery because there where no such problem > with mergemaster before switch to SVN. IMO this should be fixed at the CVS importer level personally. However there are workarounds available for the time being. Doug -- This .signature sanitized for your protection