From owner-freebsd-stable Tue Oct 15 4:47:42 2002 Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A2E5037B401 for ; Tue, 15 Oct 2002 04:47:41 -0700 (PDT) Received: from mail.rotfl.com.au (eth1779.sa.adsl.internode.on.net [150.101.235.242]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87A7943EB3 for ; Tue, 15 Oct 2002 04:47:34 -0700 (PDT) (envelope-from Phil@Kernick.org) Received: by mail.rotfl.com.au (8.12.6/8.12.6) with ESMTP id g9FBlHYQ089872 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NO); Tue, 15 Oct 2002 21:17:18 +0930 (CST) (envelope-from Phil@Kernick.org) Message-ID: <3DAC0045.4060201@Kernick.org> Date: Tue, 15 Oct 2002 21:17:17 +0930 From: Phil Kernick User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.1) Gecko/20020826 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Lucky Green Cc: freebsd-stable@FreeBSD.ORG Subject: Re: Mergemaster [was: Re: Ifconfig config of gif tunnels] References: <004401c2742a$d6169d90$6501a8c0@VAIO650> X-Enigmail-Version: 0.65.2.0 X-Enigmail-Supports: pgp-inline, pgp-mime Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG 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