Date: Tue, 04 Aug 2015 22:00:06 -0700 From: John Baldwin <jhb@freebsd.org> To: freebsd-current@freebsd.org Cc: Baptiste Daroussin <bapt@freebsd.org>, current@freebsd.org Subject: Re: [CFT] rewrite of the merge(1) utility Message-ID: <1687842.Wj34XYKLi4@ralph.baldwin.cx> In-Reply-To: <20150726012619.GP21594@ivaldir.etoilebsd.net> References: <20150726012619.GP21594@ivaldir.etoilebsd.net>
next in thread | previous in thread | raw e-mail | index | archive | help
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. -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1687842.Wj34XYKLi4>