Date: Wed, 21 Apr 2010 18:01:18 -0400 From: Sergey Babkin <babkin@verizon.net> To: Doug Barton <dougb@FreeBSD.org> Cc: hackers@freebsd.org, Jeremie Le Hen <jeremie@le-hen.org> Subject: Re: /etc in CVS Message-ID: <4BCF75AE.71F13233@verizon.net> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4BCF75AE.71F13233>