From owner-freebsd-stable@FreeBSD.ORG  Mon Mar 16 10:55:43 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 350A91065670;
	Mon, 16 Mar 2009 10:55:43 +0000 (UTC)
	(envelope-from olli@lurza.secnetix.de)
Received: from lurza.secnetix.de (lurza.secnetix.de [IPv6:2a01:170:102f::2])
	by mx1.freebsd.org (Postfix) with ESMTP id A98238FC1A;
	Mon, 16 Mar 2009 10:55:42 +0000 (UTC)
	(envelope-from olli@lurza.secnetix.de)
Received: from lurza.secnetix.de (localhost [127.0.0.1])
	by lurza.secnetix.de (8.14.3/8.14.3) with ESMTP id n2GAtHlb077733;
	Mon, 16 Mar 2009 11:55:40 +0100 (CET)
	(envelope-from oliver.fromme@secnetix.de)
Received: (from olli@localhost)
	by lurza.secnetix.de (8.14.3/8.14.3/Submit) id n2GAtHkt077732;
	Mon, 16 Mar 2009 11:55:17 +0100 (CET) (envelope-from olli)
Date: Mon, 16 Mar 2009 11:55:17 +0100 (CET)
Message-Id: <200903161055.n2GAtHkt077732@lurza.secnetix.de>
From: Oliver Fromme <olli@lurza.secnetix.de>
To: freebsd-stable@FreeBSD.ORG, dougb@FreeBSD.ORG
In-Reply-To: <49BA1BAA.3080905@FreeBSD.org>
X-Newsgroups: list.freebsd-stable
User-Agent: tin/1.8.3-20070201 ("Scotasay") (UNIX)
	(FreeBSD/6.4-PRERELEASE-20080904 (i386))
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.1.2
	(lurza.secnetix.de [127.0.0.1]);
	Mon, 16 Mar 2009 11:55:40 +0100 (CET)
Cc: 
Subject: Re: mergemaster annoyance or not?
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: freebsd-stable@FreeBSD.ORG, dougb@FreeBSD.ORG
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: Mon, 16 Mar 2009 10:55:43 -0000

Doug Barton wrote:
 > The attached patch adds a -F option to automatically install files
 > when only the FreeBSD $Ids differ. I've tested this and it seems to do
 > what the people concerned about this issue are asking for.

That seems to be a useful feature.  You need to quote the
dollar signs, though.

However, maybe the best solution is to add a new keyword
for mergemaster.rc, so the user can exactly specify which
kind of changes should be always installed.

So the new -L option (which could still exist as a short-cut)
would be the same as the following line in mergemaster.rc:

AUTO_INSTALL_DIFF='-I[$]FreeBSD:.*[$]'

For example, if someone is not interested in pure white-
space changes and changes to #-style comments, he could
let those be auto-installed thusly:

AUTO_INSTALL_DIFF='-Bb -I#.* -I[$]FreeBSD:.*[$]'

What do you think?

Best regards
   Oliver

-- 
Oliver Fromme, secnetix GmbH & Co. KG, Marktplatz 29, 85567 Grafing b. M.
Handelsregister: Registergericht Muenchen, HRA 74606,  Geschäftsfuehrung:
secnetix Verwaltungsgesellsch. mbH, Handelsregister: Registergericht Mün-
chen, HRB 125758,  Geschäftsführer: Maik Bachmann, Olaf Erb, Ralf Gebhart

FreeBSD-Dienstleistungen, -Produkte und mehr:  http://www.secnetix.de/bsd

"I have stopped reading Stephen King novels.
Now I just read C code instead."
        -- Richard A. O'Keefe