From owner-freebsd-current@FreeBSD.ORG  Sat Apr 29 19:07:41 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 6338616A42F
	for <current@freebsd.org>; Sat, 29 Apr 2006 19:07:41 +0000 (UTC)
	(envelope-from killing@multiplay.co.uk)
Received: from multiplay.co.uk (core6.multiplay.co.uk [85.236.96.23])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C5D8643D48
	for <current@freebsd.org>; Sat, 29 Apr 2006 19:07:40 +0000 (GMT)
	(envelope-from killing@multiplay.co.uk)
Received: from vader ([212.135.219.179])
	by multiplay.co.uk (multiplay.co.uk [85.236.96.23])
	(MDaemon.PRO.v8.1.3.R) with ESMTP id md50002515717.msg
	for <current@freebsd.org>; Sat, 29 Apr 2006 20:07:24 +0100
Message-ID: <016001c66bc0$2251b1f0$b3db87d4@multiplay.co.uk>
From: "Steven Hartland" <killing@multiplay.co.uk>
To: "Gordon Tetlow" <gordon@tetlows.org>,
	<current@freebsd.org>
References: <44412137.1010209@tetlows.org> <4453B08D.5090608@tetlows.org>
Date: Sat, 29 Apr 2006 20:07:12 +0100
MIME-Version: 1.0
Content-Type: text/plain; format=flowed; charset="iso-8859-1";
	reply-type=response
Content-Transfer-Encoding: 7bit
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 6.00.2900.2869
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2869
X-Spam-Processed: multiplay.co.uk, Sat, 29 Apr 2006 20:07:24 +0100
	(not processed: message from valid local sender)
X-MDRemoteIP: 212.135.219.179
X-Return-Path: killing@multiplay.co.uk
X-MDaemon-Deliver-To: current@freebsd.org
X-MDAV-Processed: multiplay.co.uk, Sat, 29 Apr 2006 20:07:24 +0100
Cc: 
Subject: Re: [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 19:07:41 -0000

Gordon Tetlow wrote:
> 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

Thats a great idea look forward to trying this out. It's been one of
my pet peeves about mergemaster for a while, glad to see someone's
had the time to put this together thanks guys.

    Steve


================================================
This e.mail is private and confidential between Multiplay (UK) Ltd. and the person or entity to whom it is addressed. In the event of misdirection, the recipient is prohibited from using, copying, printing or otherwise disseminating it or any information contained in it. 

In the event of misdirection, illegible or incomplete transmission please telephone (023) 8024 3137
or return the E.mail to postmaster@multiplay.co.uk.