From owner-freebsd-stable@FreeBSD.ORG Thu Jan 8 13:30:42 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 F3AD21065675 for ; Thu, 8 Jan 2009 13:30:41 +0000 (UTC) (envelope-from olli@lurza.secnetix.de) Received: from lurza.secnetix.de (unknown [IPv6:2a01:170:102f::2]) by mx1.freebsd.org (Postfix) with ESMTP id 6E7168FC1B for ; Thu, 8 Jan 2009 13:30:41 +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 n08DUdoh008554; Thu, 8 Jan 2009 14:30:39 +0100 (CET) (envelope-from oliver.fromme@secnetix.de) Received: (from olli@localhost) by lurza.secnetix.de (8.14.3/8.14.3/Submit) id n08DUdY1008553; Thu, 8 Jan 2009 14:30:39 +0100 (CET) (envelope-from olli) Date: Thu, 8 Jan 2009 14:30:39 +0100 (CET) Message-Id: <200901081330.n08DUdY1008553@lurza.secnetix.de> From: Oliver Fromme To: freebsd-stable@FreeBSD.ORG, jcw@highperformance.net In-Reply-To: <4965FC41.4080901@highperformance.net> 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]); Thu, 08 Jan 2009 14:30:39 +0100 (CET) Cc: Subject: Re: Version Number Only Changes X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-stable@FreeBSD.ORG, jcw@highperformance.net List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Jan 2009 13:30:42 -0000 Jason C. Wells wrote: > I am sure there is a reason for it. Upon running mergemaster this time > through it seemed like there were _a lot_ of files where the only change > was the version number. I have run to mergemaster on four more hosts. Ugh! > > mergemaster -aiU still seems to require a ton of interaction. Is there > a better way? I have the following in /etc/mergemaster.rc: DIFF_FLAG='-Bub' DIFF_OPTIONS='-I$FreeBSD:.*[$]' IGNORE_MOTD=yes Also, I'm not sure you really want to use the -a option. 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 "When your hammer is C++, everything begins to look like a thumb." -- Steve Haflich, in comp.lang.c++