From owner-freebsd-arch@FreeBSD.ORG  Thu Apr 13 07:23:10 2006
Return-Path: <owner-freebsd-arch@FreeBSD.ORG>
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 63CAB16A400;
	Thu, 13 Apr 2006 07:23:10 +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 2C52E43D49;
	Thu, 13 Apr 2006 07:23:10 +0000 (GMT)
	(envelope-from gordon@tetlows.org)
Received: from [192.168.1.54] (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 k3D7N6iR061947; 
	Thu, 13 Apr 2006 00:23:07 -0700 (PDT)
	(envelope-from gordon@tetlows.org)
Message-ID: <443DFC58.6060502@tetlows.org>
Date: Thu, 13 Apr 2006 00:23:04 -0700
From: Gordon Tetlow <gordon@tetlows.org>
User-Agent: Thunderbird 1.5 (Windows/20051201)
MIME-Version: 1.0
To: arch@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Doug Barton <dougb@freebsd.org>
Subject: Mergemaster enhancement
X-BeenThere: freebsd-arch@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussion related to FreeBSD architecture <freebsd-arch.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-arch>,
	<mailto:freebsd-arch-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-arch>
List-Post: <mailto:freebsd-arch@freebsd.org>
List-Help: <mailto:freebsd-arch-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-arch>,
	<mailto:freebsd-arch-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Apr 2006 07:23:10 -0000

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