From owner-freebsd-hackers@FreeBSD.ORG Tue Apr 20 19:00:44 2010 Return-Path: Delivered-To: hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0CEB2106568A for ; Tue, 20 Apr 2010 19:00:44 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx23.fluidhosting.com [204.14.89.6]) by mx1.freebsd.org (Postfix) with ESMTP id 90EF68FC1A for ; Tue, 20 Apr 2010 19:00:43 +0000 (UTC) Received: (qmail 6170 invoked by uid 399); 20 Apr 2010 19:00:42 -0000 Received: from localhost (HELO ?192.168.0.145?) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 20 Apr 2010 19:00:42 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4BCDF9D5.10909@FreeBSD.org> Date: Tue, 20 Apr 2010 12:00:37 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 MIME-Version: 1.0 To: Bakul Shah References: <201003231108.45102.jhb@freebsd.org> <20100324165748.7334B5B42@mail.bitblocks.com> <20100419221413.GD76198@felucia.tataz.chchile.org> <20100420183007.481F85B4D@mail.bitblocks.com> In-Reply-To: <20100420183007.481F85B4D@mail.bitblocks.com> X-Enigmail-Version: 1.0.1 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: hackers@freebsd.org, Jeremie Le Hen Subject: Re: /etc in CVS X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2010 19:00:44 -0000 On 4/20/2010 11:30 AM, Bakul Shah wrote: > > My suggestion was in the context of upgrding a system to a > new release. There are changes to /**/etc/**/*(.) files going > from release R to R+1. I was pointing out that what > mergemaster does (merging in these changes to your locally > modified etc files) is almost exactly the same as merging in > a vendor branch under CVS (vendor here would be freebsd.org). > But merge conflicts have to be resolved carefully and before > any reboots! That's not accurate. By default mergemaster does nothing, it will not change your installed /etc at all. At this point the -U option will handle major release upgrades quite painlessly, leaving only those files that actually have local mods for the user to deal with manually. Of course, I have always said that if anyone feels compelled to create a better solution for etc merging that they should feel free, and I still mean that. :) Doug -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/