Date: Fri, 18 May 2001 21:41:22 -0700 (PDT) From: Mike Harding <mvh@ix.netcom.com> To: msmith@freebsd.org Cc: roelof@nisser.com, stable@freebsd.org Subject: Re: Administrative tag a possibility? Message-ID: <20010519044122.3333C113D10@netcom1.netcom.com> In-Reply-To: <200105170543.f4H5hvZ01232@mass.dis.org> (message from Mike Smith on Wed, 16 May 2001 22:43:56 -0700) References: <200105170543.f4H5hvZ01232@mass.dis.org>
next in thread | previous in thread | raw e-mail | index | archive | help
I was actually thinking, myself, after doing about 20 upgrades, that it would surely be nice if mergemaster could tell, by checksum or other means, that you had not modified the original file and therefore it was subject to a unilateral upgrade. - Mike H. Cc: stable@freebsd.org Content-Type: text/plain; charset=iso-8859-1 Date: Wed, 16 May 2001 22:43:56 -0700 From: Mike Smith <msmith@freebsd.org> Sender: owner-freebsd-stable@FreeBSD.ORG X-Loop: FreeBSD.ORG Precedence: bulk > 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? No, not acceptable. In this case, mergemaster should be smart enough to notice that the file in question was unchanged before the merge, and just not irritate you in the first place. -- ... every activity meets with opposition, everyone who acts has his rivals and unfortunately opponents also. But not because people want to be opponents, rather because the tasks and relationships force people to take different points of view. [Dr. Fritz Todt] V I C T O R Y N O T V E N G E A N C E To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010519044122.3333C113D10>