From owner-freebsd-current@FreeBSD.ORG  Sat Apr 15 16:37:14 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 926CD16A405
	for <current@freebsd.org>; Sat, 15 Apr 2006 16:37:14 +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 46BE343D72
	for <current@freebsd.org>; Sat, 15 Apr 2006 16:37:14 +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 k3FGbAiR081675
	for <current@freebsd.org>; Sat, 15 Apr 2006 09:37:11 -0700 (PDT)
	(envelope-from gordon@tetlows.org)
Message-ID: <44412137.1010209@tetlows.org>
Date: Sat, 15 Apr 2006 09:37:11 -0700
From: Gordon Tetlow <gordon@tetlows.org>
User-Agent: Thunderbird 1.5 (Windows/20051201)
MIME-Version: 1.0
To: current@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-Mailman-Approved-At: Sat, 15 Apr 2006 16:59:02 +0000
Cc: 
Subject: [CFR] Mergemaster auto upgrade patch
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, 15 Apr 2006 16:37:14 -0000

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