Date: Wed, 16 May 2001 22:43:56 -0700 From: Mike Smith <msmith@freebsd.org> To: Roelof Osinga <roelof@nisser.com> Cc: stable@freebsd.org Subject: Re: Administrative tag a possibility? Message-ID: <200105170543.f4H5hvZ01232@mass.dis.org> In-Reply-To: Your message of "Thu, 17 May 2001 07:32:38 %2B0200." <3B036276.944E19DB@nisser.com>
next in thread | previous in thread | raw e-mail | index | archive | help
> Being in a cycle of updates I got once again confronted - though assist=
ed
> by mergemaster - with a series of needless needs to accord administrati=
ve
> changes like:
> =
> -----
> *** Displaying differences between ./etc/gettytab and installed versi=
on
> =
> --- /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 tabl=
e,
> -----
> =
> 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.
-- =
=2E.. 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200105170543.f4H5hvZ01232>