From owner-freebsd-current@freebsd.org Fri Aug 14 15:25:03 2015 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 13C969B9A55 for ; Fri, 14 Aug 2015 15:25:03 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C1C8D11FB; Fri, 14 Aug 2015 15:25:02 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from slw by zxy.spb.ru with local (Exim 4.84 (FreeBSD)) (envelope-from ) id 1ZQGqq-00024D-Go; Fri, 14 Aug 2015 18:25:00 +0300 Date: Fri, 14 Aug 2015 18:25:00 +0300 From: Slawa Olhovchenkov To: Julian Elischer Cc: John Baldwin , freebsd-current@freebsd.org, Baptiste Daroussin Subject: Re: [CFT] rewrite of the merge(1) utility Message-ID: <20150814152500.GH1872@zxy.spb.ru> References: <20150726012619.GP21594@ivaldir.etoilebsd.net> <1687842.Wj34XYKLi4@ralph.baldwin.cx> <20150813131343.GA43013@zxy.spb.ru> <7204455.dGN1cQ55dZ@ralph.baldwin.cx> <55CE06F3.9030809@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <55CE06F3.9030809@freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: slw@zxy.spb.ru X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Aug 2015 15:25:03 -0000 On Fri, Aug 14, 2015 at 11:19:15PM +0800, Julian Elischer wrote: > On 8/13/15 11:23 PM, John Baldwin wrote: > > On Thursday, August 13, 2015 04:13:43 PM Slawa Olhovchenkov wrote: > >> On Tue, Aug 04, 2015 at 10:00:06PM -0700, John Baldwin wrote: > >> > >>> On Sunday, July 26, 2015 03:26:22 AM Baptiste Daroussin wrote: > >>>> Hi all, > >>>> > >>>> I was botherd to not have the merge(1) utility available in base (for etcupdate) > >>>> when building base WITHOUT_RCS. > >>>> > >>>> So I have rewritten a merge(1) utility which should be compatible. > >>>> > >>>> I used the 3-way merge code from the fossil VCS instead of making it call diff3. > >>>> All I have done from the fossil code is adapting it to use sbuf(9). > >>>> > >>>> The bonus for end users is the merge from fossil can resolve situation where the > >>>> diff3 in base cannot. (which explains a "failure" with the GNU RCS test suite) > >>>> > >>>> meaning etcupdate will be more happy merge configuration files. > >>> Thanks! This will save me from having to hack etcupdate to use diff3 instead > >>> of merge. > >> Hi, can I use etcupdate to update /etc w/o source tree? > >> I.e. I take from new distro /var/db/etcupdate and try to update /etc? > > etcupdate does a 3-way merge of an "old" stock /etc and a "new" stock /etc > > into /etc. The "old" stock /etc is always stored in /var/db/etcupdate. > > The "new" stock /etc has to come from somewhere. One option is to generate > > it from /usr/src (e.g. after a buildworld). However, you can also pregenerate > > tarballs from a /usr/src tree on one machine and then use those tarballs > > instead of generating an /etc tree from /usr/src on another machine. I've > > used this for upgrades of a cluster of machines where a single machine would > > build release "images" that were basically a buildworld + an 'etcupdate build' > > from the corresponding src tree. I then used 'etcupdate -t /path/to/tarball' > > to update /etc after installing the new world. > > > > The idea is that for something like freebsd-update one could ship the latest > > etcupdate build tarball on each update to do a full 3-way merge of /etc. > > > what is the rational for using etcupdate instead of mergemaster when > upgrading? I am try to eliminate using source in upgrading path. (On build host run release.sh for some revision and using base.txz/kernel.XYZ.txz for upgrade together with beadm)