From owner-freebsd-stable@FreeBSD.ORG  Fri Mar 13 04:18:32 2009
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
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 7A6E8106566B
	for <freebsd-stable@freebsd.org>; Fri, 13 Mar 2009 04:18:32 +0000 (UTC)
	(envelope-from eugen@kuzbass.ru)
Received: from www.svzserv.kemerovo.su (www.svzserv.kemerovo.su
	[213.184.65.80])
	by mx1.freebsd.org (Postfix) with ESMTP id D82EC8FC14
	for <freebsd-stable@freebsd.org>; Fri, 13 Mar 2009 04:18:31 +0000 (UTC)
	(envelope-from eugen@kuzbass.ru)
Received: from www.svzserv.kemerovo.su (eugen@localhost [127.0.0.1])
	by www.svzserv.kemerovo.su (8.13.8/8.13.8) with ESMTP id n2D4IQw5056902;
	Fri, 13 Mar 2009 11:18:26 +0700 (KRAT)
	(envelope-from eugen@www.svzserv.kemerovo.su)
Received: (from eugen@localhost)
	by www.svzserv.kemerovo.su (8.13.8/8.13.8/Submit) id n2D4IPXo056901;
	Fri, 13 Mar 2009 11:18:25 +0700 (KRAT) (envelope-from eugen)
Date: Fri, 13 Mar 2009 11:18:25 +0700
From: Eugene Grosbein <eugen@kuzbass.ru>
To: freebsd-stable@freebsd.org, antik@bsd.ee
Message-ID: <20090313041825.GA56699@svzserv.kemerovo.su>
References: <49B8AB66.9080408@bsd.ee>
	<200903121505.n2CF5RXx047734@lurza.secnetix.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200903121505.n2CF5RXx047734@lurza.secnetix.de>
User-Agent: Mutt/1.4.2.3i
Cc: 
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 <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, 
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Mar 2009 04:18:32 -0000

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

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.

> 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.

Eugene Grosbein