Date: Thu, 13 Aug 2015 16:13:43 +0300 From: Slawa Olhovchenkov <slw@zxy.spb.ru> To: John Baldwin <jhb@freebsd.org> Cc: freebsd-current@freebsd.org, Baptiste Daroussin <bapt@freebsd.org>, current@freebsd.org Subject: Re: [CFT] rewrite of the merge(1) utility Message-ID: <20150813131343.GA43013@zxy.spb.ru> In-Reply-To: <1687842.Wj34XYKLi4@ralph.baldwin.cx> References: <20150726012619.GP21594@ivaldir.etoilebsd.net> <1687842.Wj34XYKLi4@ralph.baldwin.cx>
next in thread | previous in thread | raw e-mail | index | archive | help
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?
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150813131343.GA43013>