From owner-freebsd-current@FreeBSD.ORG  Sat Apr 29 18:29:16 2006
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
X-Original-To: current@freebsd.org
Delivered-To: freebsd-current@FreeBSD.ORG
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 862D216A400
	for <current@freebsd.org>; Sat, 29 Apr 2006 18:29:16 +0000 (UTC)
	(envelope-from gordon@tetlows.org)
Received: from spiff.melthusia.org (spiff.melthusia.org [207.67.244.17])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A7D6743D4C
	for <current@freebsd.org>; Sat, 29 Apr 2006 18:29:15 +0000 (GMT)
	(envelope-from gordon@tetlows.org)
Received: from [192.168.1.50] (cpe-66-91-238-221.san.res.rr.com
	[66.91.238.221]) (authenticated bits=0)
	by spiff.melthusia.org (8.12.10/8.12.10) with ESMTP id k3TITEiR094419
	for <current@freebsd.org>; Sat, 29 Apr 2006 11:29:14 -0700 (PDT)
	(envelope-from gordon@tetlows.org)
Message-ID: <4453B08D.5090608@tetlows.org>
Date: Sat, 29 Apr 2006 11:29:33 -0700
From: Gordon Tetlow <gordon@tetlows.org>
User-Agent: Thunderbird 1.5.0.2 (Windows/20060308)
MIME-Version: 1.0
To: current@freebsd.org
References: <44412137.1010209@tetlows.org>
In-Reply-To: <44412137.1010209@tetlows.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-Mailman-Approved-At: Sat, 29 Apr 2006 18:30:22 +0000
Cc: 
Subject: [HEADS UP] Mergemaster auto upgrade patch committed
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Apr 2006 18:29:16 -0000

My mergemaster auto upgrade patch has been committed. Please try out the 
new -U switch and let me know what you think.

Thanks,
-gordon

Gordon Tetlow wrote:
> I've thrown together a quick mergemaster enhancement (under a new 
> command line switch: -U) that will automatically upgrade files that 
> have changed in the /usr/src/etc distribution but the user hasn't 
> changed. Great applications are for when you trust that the project 
> isn't going to break everything and only don't want mergemaster to 
> squash files that you have customized.
>
> Patch location: 
> http://people.freebsd.org/~gordon/patches/mergemaster.mtree.diff
>
> Please try it out!
>
> Thanks,
> Gordon
> _______________________________________________
> freebsd-current@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-current
> To unsubscribe, send any mail to 
> "freebsd-current-unsubscribe@freebsd.org"