From owner-freebsd-hackers@FreeBSD.ORG Thu Apr 22 01:28:27 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 380491065672 for ; Thu, 22 Apr 2010 01:28:27 +0000 (UTC) (envelope-from babkin@verizon.net) Received: from vms173005pub.verizon.net (vms173005pub.verizon.net [206.46.173.5]) by mx1.freebsd.org (Postfix) with ESMTP id 183708FC14 for ; Thu, 22 Apr 2010 01:28:26 +0000 (UTC) Received: from verizon.net ([unknown] [173.54.27.21]) by vms173005.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0L190075L831GVM8@vms173005.mailsrvcs.net>; Wed, 21 Apr 2010 20:28:14 -0500 (CDT) Sender: root Message-id: <4BCF75AE.71F13233@verizon.net> Date: Wed, 21 Apr 2010 18:01:18 -0400 From: Sergey Babkin X-Mailer: Mozilla 4.7 [en] (X11; U; FreeBSD 4.7-RELEASE i386) X-Accept-Language: en, ru MIME-version: 1.0 To: Doug Barton References: <201003231108.45102.jhb@freebsd.org> <20100324165748.7334B5B42@mail.bitblocks.com> <20100419221413.GD76198@felucia.tataz.chchile.org> <20100420183007.481F85B4D@mail.bitblocks.com> <4BCDF9D5.10909@FreeBSD.org> Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailman-Approved-At: Thu, 22 Apr 2010 02:57:30 +0000 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: Thu, 22 Apr 2010 01:28:27 -0000 Doug Barton wrote: > > 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. :) I wonder if a version control system, like SVN, could be used to keep track of all the changes in /etc. (Or maybe it already is and I'm simply out of date). -SB