From owner-freebsd-questions Fri Nov 24 10:57:42 2000 Delivered-To: freebsd-questions@freebsd.org Received: from 2711.dynacom.net (2711.dynacom.net [206.107.213.3]) by hub.freebsd.org (Postfix) with ESMTP id 7BE8337B4C5 for ; Fri, 24 Nov 2000 10:57:40 -0800 (PST) Received: from urx.com (dsl1-160.dynacom.net [206.159.132.160]) by 2711.dynacom.net (Build 101 8.9.3/NT-8.9.3) with ESMTP id KAA07150; Fri, 24 Nov 2000 10:57:27 -0800 Message-ID: <3A1EBA17.65FE598E@urx.com> Date: Fri, 24 Nov 2000 10:57:27 -0800 From: Kent Stewart Reply-To: kstewart@urx.com Organization: Dynacom X-Mailer: Mozilla 4.76 [en] (Windows NT 5.0; U) X-Accept-Language: en MIME-Version: 1.0 To: Gene Harris Cc: freebsd-questions Subject: Re: Using MergeMaster References: <51F9B228ED26D311A17700A0C9982664013F40@tetboss.internal.tetronsoftware.com> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Gene Harris wrote: > > I have two simple questions about mergemaster. > > When is it appropriate to run mergemaster? I usually update my 4.x-STABLE > sources once per month. I haven't been trying to merge changes in /etc, but > I noticed that my sendmail version and sendmail.cf versions were badly out > of sync and I manually update sendmail.cf from freebsd.cf. It is appropriate everytime they are upgraded. If you don't follow the cvsup changes, than I would think that is everytime you do an installworld. Otherwise, you will have installed a module and haven't installed the configuration file that it needs. > > Is it appropriate to just run mergemaster by typing the command and letting > it run its course? Not unless you have configuration files you want to redo. For example, I have a rc.firewall that has additional stuff and if they update it, my rc firewall disappears. My root abbreviations also disappear along with my modified dot."files" that I have setup for typical new user additions. Kent > > Many Thanks, > > Gene Harris > http://www.tetronsoftware.com > FreeBSD Samba PostgreSQL Apache > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-questions" in the body of the message -- Kent Stewart Richland, WA mailto:kbstew99@hotmail.com http://kstewart.urx.com/kstewart/index.html FreeBSD News http://daily.daemonnews.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message