Date: Tue, 15 Oct 2002 21:17:17 +0930 From: Phil Kernick <Phil@Kernick.org> To: Lucky Green <shamrock@cypherpunks.to> Cc: freebsd-stable@FreeBSD.ORG Subject: Re: Mergemaster [was: Re: Ifconfig config of gif tunnels] Message-ID: <3DAC0045.4060201@Kernick.org> References: <004401c2742a$d6169d90$6501a8c0@VAIO650>
next in thread | previous in thread | raw e-mail | index | archive | help
Lucky Green wrote:
> Matthew Dillon wrote about mergemaster:
> -----------------
> I also like the idea someone posted in regards to having a list of
> files 'typically never modified by the sysop', e.g. /etc/defaults/*,
> /etc/rc*, and so forth, though with the patches I have so far that
> particular problem is not so big a deal any more (at least not for
> me).
> -----------------
I'd also like the opposite - a list of files that mergemaster will not update
under any circumstances. At the moment I remove the CVS id from the top of
all of the files that I modify so that I remember during mergemaster whether I
should update them or not.
Phil.
--
_-_|\ Phil Kernick E-Mail: Phil@Kernick.org
/ \ ROTFL Enterprises Mobile: 041 61 ROTFL
\_.-*_/
v Humourist, satirist, and probably a few more 'ists to boot!
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?3DAC0045.4060201>