From owner-freebsd-stable Thu May 17 12:15:31 2001 Delivered-To: freebsd-stable@freebsd.org Received: from mail.gmx.net (pop.gmx.net [194.221.183.20]) by hub.freebsd.org (Postfix) with SMTP id 3991137B43C for ; Thu, 17 May 2001 12:15:20 -0700 (PDT) (envelope-from Gerhard.Sittig@gmx.net) Received: (qmail 5540 invoked by uid 0); 17 May 2001 19:15:18 -0000 Received: from p3ee20aa0.dip.t-dialin.net (HELO speedy.gsinet) (62.226.10.160) by mail.gmx.net (mp007-rz3) with SMTP; 17 May 2001 19:15:18 -0000 Received: (from sittig@localhost) by speedy.gsinet (8.8.8/8.8.8) id QAA03846 for stable@freebsd.org; Thu, 17 May 2001 16:22:18 +0200 Date: Thu, 17 May 2001 16:22:18 +0200 From: Gerhard Sittig To: stable@freebsd.org Subject: Re: Administrative tag a possibility? Message-ID: <20010517162218.C253@speedy.gsinet> Mail-Followup-To: stable@freebsd.org References: <3B036276.944E19DB@nisser.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 1.0i In-Reply-To: <3B036276.944E19DB@nisser.com>; from roelof@nisser.com on Thu, May 17, 2001 at 07:32:38AM +0200 Organization: System Defenestrators Inc. Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Thu, May 17, 2001 at 07:32 +0200, Roelof Osinga wrote: > > Being in a cycle of updates I got once again confronted - > though assisted by mergemaster - with a series of needless > needs to accord administrative changes like: > > ----- > *** Displaying differences between ./etc/gettytab and installed version > > --- /etc/gettytab Mon Feb 15 11:45:33 1999 > +++ ./etc/gettytab Thu May 17 07:15:19 2001 > @@ -1,4 +1,4 @@ > -# $Id: gettytab,v 1.16 1998/09/02 01:34:55 brian Exp $ > +# $FreeBSD: src/etc/gettytab,v 1.16.2.1 1999/08/29 14:18:43 peter Exp $ > # from: @(#)gettytab 5.14 (Berkeley) 3/27/91 > # > # Most of the table entries here are just copies of the old getty table, > ----- > > Which got me thinking, dangerous though it may be, would it > really not be possible to devise some secret handshake that > would allow a tool like mergemaster or even - yeah, I'm > stretching concepts - a human to recognize such a change for > what it is and act correspondingly? > > Say introducing a convention like '$!$' to denote an always to > be acceptable change? You might have a look at the mergemaster source (after all it's a shell script) and provide a patch to its author. There could be a second step after diffing the files to check if it's a "real diff". Copy both the /etc and /usr/src/etc files to a temporary location while squeezing the RCS Id (and friends) tags. Like sed 's/\$Id: [^\$]*\$/$Id: $/; s/\$FreeBSD: [^\$]*\$/$FreeBSD: $/' And then diff them again (with the -q option?) to see if the diff is bogus. If so, you can assume that i)nstall is the option the user would have wanted to choose. :) It might be best to make this behaviour optional. virtually yours 82D1 9B9C 01DC 4FB4 D7B4 61BE 3F49 4F77 72DE DA76 Gerhard Sittig true | mail -s "get gpg key" Gerhard.Sittig@gmx.net -- If you don't understand or are scared by any of the above ask your parents or an adult to help you. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message