From owner-freebsd-questions@FreeBSD.ORG Mon Apr 6 16:26:36 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 70C94106568A for ; Mon, 6 Apr 2009 16:26:36 +0000 (UTC) (envelope-from chowse@charter.net) Received: from mta31.charter.net (mta31.charter.net [216.33.127.82]) by mx1.freebsd.org (Postfix) with ESMTP id 072EF8FC1F for ; Mon, 6 Apr 2009 16:26:35 +0000 (UTC) (envelope-from chowse@charter.net) Received: from imp10 ([10.20.200.10]) by mta31.charter.net (InterMail vM.7.09.01.00 201-2219-108-20080618) with ESMTP id <20090406162623.VJPO2647.mta31.charter.net@imp10>; Mon, 6 Apr 2009 12:26:23 -0400 Received: from [192.168.254.3] ([24.176.107.223]) by imp10 with charter.net id cGSN1b00C4pDbjL05GSNw9; Mon, 06 Apr 2009 12:26:23 -0400 Message-Id: <726F1B0E-BF6A-4F4B-BB7D-D71CFE1ED6FE@charter.net> From: Charles Howse To: Manolis Kiagias In-Reply-To: <49DA1EAA.7030602@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 11:26:21 -0500 References: <49D9EFA8.709@gmail.com> <49DA1EAA.7030602@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 16:26:36 -0000 On Apr 6, 2009, at 10:24 AM, Manolis Kiagias wrote: > Charles Howse wrote: >> >> >> 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? >> >> >> > You are correct. As long as the content of the file is right for the > purpose, the line added by CVS is simply ignored by anything and > everything - except mergemaster and friends when upgrading. As I suspected. Thanks for the confirmation. I have completed my upgrade to 6.4-STABLE with the following hiccups: mergemaster -iU couldn't find a btree database, so it skipped the auto update. It did save a database at the end, so I assume I can use that next time. I never thought to check for which side of the screen the old file was on after I chose "m" to merge. Finally figured out that the old file is on the left, and the temp on the right. Once finished completely, there were no problems I couldn't recover from. Good thing this is a brand new installation, with only 2 accounts! :-) Thanks for all the help!