From owner-freebsd-arch@FreeBSD.ORG Thu Apr 13 18:56:29 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 E221316A403; Thu, 13 Apr 2006 18:56:28 +0000 (UTC) (envelope-from gtetlow@spiff.melthusia.org) Received: from spiff.melthusia.org (spiff.melthusia.org [207.67.244.17]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B38643D45; Thu, 13 Apr 2006 18:56:28 +0000 (GMT) (envelope-from gtetlow@spiff.melthusia.org) Received: from spiff.melthusia.org (gtetlow@localhost [127.0.0.1]) by spiff.melthusia.org (8.12.10/8.12.10) with ESMTP id k3DIuNiR066321; Thu, 13 Apr 2006 11:56:23 -0700 (PDT) (envelope-from gtetlow@spiff.melthusia.org) Received: (from gtetlow@localhost) by spiff.melthusia.org (8.12.10/8.12.10/Submit) id k3DIuNLU066320; Thu, 13 Apr 2006 11:56:23 -0700 (PDT) (envelope-from gtetlow) Date: Thu, 13 Apr 2006 11:56:23 -0700 From: Gordon Tetlow To: "Marc G. Fournier" Message-ID: <20060413185623.GM4273@spiff.melthusia.org> References: <443DFC58.6060502@tetlows.org> <443E9167.6090309@elischer.org> <20060413150544.N1096@ganymede.hub.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Wtrm9ATX0sn6fFKv" Content-Disposition: inline In-Reply-To: <20060413150544.N1096@ganymede.hub.org> X-Habeas-SWE-1: winter into spring X-Habeas-SWE-2: brightly anticipated X-Habeas-SWE-3: like Habeas SWE (tm) X-Habeas-SWE-4: Copyright 2002 Habeas (tm) X-Habeas-SWE-5: Sender Warranted Email (SWE) (tm). The sender of this X-Habeas-SWE-6: email in exchange for a license for this Habeas X-Habeas-SWE-7: warrant mark warrants that this is a Habeas Compliant X-Habeas-SWE-8: Message (HCM) and not spam. Please report use of this X-Habeas-SWE-9: mark in spam to . User-Agent: Mutt/1.5.6i Cc: arch@freebsd.org, Doug Barton , Julian Elischer 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:56:29 -0000 --Wtrm9ATX0sn6fFKv Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Apr 13, 2006 at 03:07:16PM -0300, Marc G. Fournier wrote: > On Thu, 13 Apr 2006, Julian Elischer wrote: >=20 > >Gordon Tetlow wrote: > > > >>I've thrown together a quick mergemaster enhancement that will=20 > >>automagically upgrade files that have changed in the /usr/src/etc=20 > >>distribution but the user hasn't changed. Great applications are for wh= en=20 > >>you trust that we aren't going to break everything and only don't want= =20 > >>mergemaster to squash files that you have customized. > >> > >>Patch location:=20 > >>http://people.freebsd.org/~gordon/patches/mergemaster.mtree.diff > >> > >>How it works: > >>Through clever use of mtree, I build an mtree description of everything= =20 > >>that make distribution installs (only size and md5) from the temproot.= =20 > >>When the user completes a mergemaster run, the mtree description file= =20 > >>gets installed into /var/db for safe-keeping. > >> > >>When the user then decides to do a subsequent upgrade (with the -U flag= ),=20 > >>the existing mtree description from /var/db is called into service=20 > >>looking for files that are different in DESTDIR. This is stashed away= =20 > >>until a file that would normally end up prompting you to look at change= s=20 > >>is encountered. Since there are no user modified changes, the new file = is=20 > >>installed without bothering the user. > >> > >>Let me know what you think. > > > > > >I really like it > >especially as it is optional >=20 > I don't know if there is any way of doing this "automatically", but the= =20 > one beef I have with mergemaster is it prompting me whether I want to=20 > install the new one if all that has changed is the $Id tag ... I don't=20 > mind looking at the diff of the ones that there are actual changes to, or= =20 > doing a -U to 'skip' those, but would be nice if the ones that *really*= =20 > haven't changed were done automatically ... Add the following in /etc/mergemaster.rc: DIFF_OPTIONS=3D-I '$FreeBSD:' That should do it (I haven't tried it). -gordon --Wtrm9ATX0sn6fFKv Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (FreeBSD) iD8DBQFEPp7XRu2t9DV9ZfsRApYSAKDUIXUDQ8o2U1WpUlbslhIykevP0QCeJKaV aYzdOJNn+MSYhkn9buTK2gU= =hH/j -----END PGP SIGNATURE----- --Wtrm9ATX0sn6fFKv--