From owner-freebsd-questions@FreeBSD.ORG Mon Apr 6 12:53:59 2009 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 27C7810656CC for ; Mon, 6 Apr 2009 12:53:59 +0000 (UTC) (envelope-from chowse@charter.net) Received: from mta21.charter.net (mta21.charter.net [216.33.127.81]) by mx1.freebsd.org (Postfix) with ESMTP id A6BA08FC0C for ; Mon, 6 Apr 2009 12:53:58 +0000 (UTC) (envelope-from chowse@charter.net) Received: from imp09 ([10.20.200.9]) by mta21.charter.net (InterMail vM.7.09.01.00 201-2219-108-20080618) with ESMTP id <20090406125346.UMUR3344.mta21.charter.net@imp09>; Mon, 6 Apr 2009 08:53:46 -0400 Received: from [192.168.254.3] ([24.176.107.223]) by imp09 with charter.net id cCtl1b00D4pDbjL05Ctlou; Mon, 06 Apr 2009 08:53:46 -0400 Message-Id: From: Charles Howse To: Manolis Kiagias In-Reply-To: <49D9EFA8.709@gmail.com> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v930.3) Date: Mon, 6 Apr 2009 07:53:45 -0500 References: <49D9EFA8.709@gmail.com> X-Mailer: Apple Mail (2.930.3) Cc: FreeBSD Questions Subject: Re: mergemaster options X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2009 12:54:12 -0000 On Apr 6, 2009, at 7:03 AM, Manolis Kiagias wrote: > Charles Howse wrote: >> Hi, >> I'm upgrading form 4.6-RELEASE to 4.6-STABLE. >> When I get to the *second* run of mergemaster (after installworld), >> I'd be interested to hear the list's comments on using options to >> start mergemaster. >> >> For example, have you had good luck with: >> mergemaster -i -u (install any files that don't already exist, and >> attempt to install any files that haven't been user-modified) > > Yes, I am using this all the time. Note that you need a capital "U": > > mergemaster -iU Right, capital U. That's good to know. Thanks. > > >> >> Also, what is the first line of a file used for? What parts of the >> OS >> 'care' about that line? What would happen if I kept the existing >> file >> below, with it's older date and version #? (This is just a made-up >> example). >> >> keep this existing file: >> # $FreeBSD: src/etc/csh.cshrc,v 1.3 1999/08/27 23:23:40 peter Exp $ >> my custom line >> blah >> >> delete this (fake) temporary file: >> # $FreeBSD: src/etc/csh.cshrc,v 1.4 2000/08/27 23:23:40 peter Exp $ >> blah >> blah >> >> I hope that's clear...? >> > > The lines you see starting with $FreeBSD are used by the Version > Control > System (CVS or SVN). > You have to judge by the content of the older file (not by the tag) > whether to keep or upgrade the file. Usually, you will let it upgrade > all files which you have not modified yourself. In some of these the > only thing that changes is the tag. > Before doing the mergemaster step, I suggest you keep a complete > backup > copy of your /etc directory. It may happen that you replace a file > you > actually need. And it is a real problem if you overwrite, say, > master.passwd :) Actually, I wasn't asking about the CVS line with regard to mergemaster. I realize that mergemaster will stop and ask about any file in its list with a CVS line older than the new file. What I really want to know is, let's say the file above is /etc/ hosts.allow, and I have customized it according to my needs. If I leave the old file in /etc, I'm thinking it will still work just fine. It's only mergemaster, and maybe cvsup, and things that actually deal with version control that are concerned with the CVS line. Am I correct?