From owner-freebsd-current@FreeBSD.ORG Wed Mar 18 21:59:46 2009 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 66E66106566B for ; Wed, 18 Mar 2009 21:59:46 +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 EDB6D8FC08 for ; Wed, 18 Mar 2009 21:59:45 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 6110 invoked by uid 399); 18 Mar 2009 21:59:43 -0000 Received: from localhost (HELO lap.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 18 Mar 2009 21:59:43 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <49C16ECD.1040901@FreeBSD.org> Date: Wed, 18 Mar 2009 14:59:41 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.19 (X11/20090312) MIME-Version: 1.0 To: FreeBSD Current X-Enigmail-Version: 0.95.7 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: New mergemaster option to install files that differ only by $FreeBSD X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Mar 2009 21:59:46 -0000 This was already discussed on -stable recently, so I've committed the change in order to get it MFCed prior to the 7.2 code freeze. Would those of you who were concerned about this issue during the last round of discussions please test this new option and report back? Thanks, Doug -------- Original Message -------- Subject: svn commit: r189992 - head/usr.sbin/mergemaster Date: Wed, 18 Mar 2009 21:51:12 +0000 (UTC) From: Doug Barton To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Author: dougb Date: Wed Mar 18 21:51:11 2009 New Revision: 189992 URL: http://svn.freebsd.org/changeset/base/189992 Log: Add a new -F option to automatically install files that differ only by version control Id strings Modified: head/usr.sbin/mergemaster/mergemaster.sh