From owner-freebsd-arch@FreeBSD.ORG Sat Apr 15 14:38:24 2006 Return-Path: X-Original-To: arch@freebsd.org Delivered-To: freebsd-arch@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CDE1516A401; Sat, 15 Apr 2006 14:38:24 +0000 (UTC) (envelope-from o_sleep@belovedarctos.com) Received: from mail.belovedarctos.com (mail.belovedarctos.com [66.114.86.142]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6922143D69; Sat, 15 Apr 2006 14:38:24 +0000 (GMT) (envelope-from o_sleep@belovedarctos.com) Received: from [10.0.1.99] (unknown [10.0.1.99]) by mail.belovedarctos.com (Postfix) with ESMTP id 3AA9F8098; Sat, 15 Apr 2006 14:38:23 +0000 (UTC) In-Reply-To: <443DFC58.6060502@tetlows.org> References: <443DFC58.6060502@tetlows.org> Mime-Version: 1.0 (Apple Message framework v749.3) Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-Id: <6F386078-4BE2-4D87-B75A-378B698DA19B@belovedarctos.com> Content-Transfer-Encoding: 7bit From: Bjorn Nelson Date: Sat, 15 Apr 2006 10:38:22 -0400 To: Gordon Tetlow X-Mailer: Apple Mail (2.749.3) Cc: arch@freebsd.org, Doug Barton Subject: Re: Mergemaster enhancement X-BeenThere: freebsd-arch@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussion related to FreeBSD architecture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 14:38:24 -0000 Gordon, I modified mergemaster with a different approach: Only if you check in a file to RCS will mergemaster do a diff, otherwise it will overwrite it. This is nice because it forces you to version your configs :) Just put the following line in /etc/mergemaster.rc: MM_PRE_COMPARE_SCRIPT=/directory/precompare_mm.sh I wrote about this script: http://www.onlamp.com/bsd/2006/04/13/examples/precompare_mm.sh in an article I recently published: http://www.onlamp.com/pub/a/bsd/2006/04/13/freebsd-build-system.html -Bjorn On Apr 13, 2006, at 3:23 AM, Gordon Tetlow wrote: > I've thrown together a quick mergemaster enhancement that will > automagically 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 we aren'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 > > How it works: > Through clever use of mtree, I build an mtree description of > everything that make distribution installs (only size and md5) from > the temproot. When the user completes a mergemaster run, the mtree > description file gets installed into /var/db for safe-keeping. > > When the user then decides to do a subsequent upgrade (with the -U > flag), the existing mtree description from /var/db is called into > service looking for files that are different in DESTDIR. This is > stashed away until a file that would normally end up prompting you > to look at changes is encountered. Since there are no user modified > changes, the new file is installed without bothering the user. > > Let me know what you think. > > Thanks, > -gordon > _______________________________________________ > freebsd-arch@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-arch > To unsubscribe, send any mail to "freebsd-arch- > unsubscribe@freebsd.org"