From owner-freebsd-arch@FreeBSD.ORG Thu Apr 13 18:07:18 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 DDC4E16A401; Thu, 13 Apr 2006 18:07:18 +0000 (UTC) (envelope-from scrappy@hub.org) Received: from hub.org (hub.org [200.46.204.220]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3496843D46; Thu, 13 Apr 2006 18:07:18 +0000 (GMT) (envelope-from scrappy@hub.org) Received: from localhost (unknown [200.46.204.254]) by hub.org (Postfix) with ESMTP id 8D39262C8B0; Thu, 13 Apr 2006 15:07:17 -0300 (ADT) X-Virus-Scanned: by amavisd-new at hub.org Received: from hub.org ([200.46.204.220]) by localhost (mx2.hub.org [200.46.204.254]) (amavisd-new, port 10024) with ESMTP id 2uAN7tm+vZnX; Thu, 13 Apr 2006 15:07:17 -0300 (ADT) Received: from ganymede.hub.org (blk-222-82-85.eastlink.ca [24.222.82.85]) by hub.org (Postfix) with ESMTP id 1699062C8AB; Thu, 13 Apr 2006 15:07:17 -0300 (ADT) Received: by ganymede.hub.org (Postfix, from userid 1000) id 5717B3E3DB; Thu, 13 Apr 2006 15:07:16 -0300 (ADT) Received: from localhost (localhost [127.0.0.1]) by ganymede.hub.org (Postfix) with ESMTP id 55D17383A1; Thu, 13 Apr 2006 15:07:16 -0300 (ADT) Date: Thu, 13 Apr 2006 15:07:16 -0300 (ADT) From: "Marc G. Fournier" To: Julian Elischer In-Reply-To: <443E9167.6090309@elischer.org> Message-ID: <20060413150544.N1096@ganymede.hub.org> References: <443DFC58.6060502@tetlows.org> <443E9167.6090309@elischer.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: arch@freebsd.org, Doug Barton , Gordon Tetlow 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: Thu, 13 Apr 2006 18:07:19 -0000 On Thu, 13 Apr 2006, Julian Elischer wrote: > 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. > > > I really like it > especially as it is optional I don't know if there is any way of doing this "automatically", but the one beef I have with mergemaster is it prompting me whether I want to install the new one if all that has changed is the $Id tag ... I don't mind looking at the diff of the ones that there are actual changes to, or doing a -U to 'skip' those, but would be nice if the ones that *really* haven't changed were done automatically ... ---- Marc G. Fournier Hub.Org Networking Services (http://www.hub.org) Email: scrappy@hub.org Yahoo!: yscrappy ICQ: 7615664