From owner-freebsd-current@FreeBSD.ORG Wed Apr 19 09:06:38 2006 Return-Path: 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 5DC3016A402; Wed, 19 Apr 2006 09:06:38 +0000 (UTC) (envelope-from tobez@tobez.org) Received: from heechee.tobez.org (heechee.tobez.org [194.255.56.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F201843D45; Wed, 19 Apr 2006 09:06:37 +0000 (GMT) (envelope-from tobez@tobez.org) Received: by heechee.tobez.org (Postfix, from userid 1001) id B2D5E125427; Wed, 19 Apr 2006 11:06:35 +0200 (CEST) Date: Wed, 19 Apr 2006 11:06:35 +0200 From: Anton Berezin To: Gordon Tetlow Message-ID: <20060419090635.GA24914@heechee.tobez.org> Mail-Followup-To: Anton Berezin , Gordon Tetlow , current@freebsd.org, dougb@freebsd.org References: <44412137.1010209@tetlows.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <44412137.1010209@tetlows.org> User-Agent: Mutt/1.4.2.1i X-Powered-By: FreeBSD http://www.freebsd.org/ Cc: dougb@freebsd.org, current@freebsd.org Subject: Re: [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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Apr 2006 09:06:38 -0000 On Sat, Apr 15, 2006 at 09:37:11AM -0700, 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! I think this is pretty cool, and is better suited for a wider audience than similar CVS-based solutions proposed earlier (http://www.freebsd.org/cgi/mid.cgi?id=427743ED.6020200%40FreeBSD.org&db=mid and http://www.freebsd.org/cgi/getmsg.cgi?fetch=0+0+/usr/local/www/db/text/2005/freebsd-audit/20050116.freebsd-audit). The patch looks fine and appears to work as advertized. :-) I hope dougb will pay attention. \Anton. -- An undefined problem has an infinite number of solutions. -- Robert A. Humphrey