From owner-freebsd-current@freebsd.org  Wed Aug  5 05:27:39 2015
Return-Path: <owner-freebsd-current@freebsd.org>
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 234949B41D7;
 Wed,  5 Aug 2015 05:27:39 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1])
 (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 01E85C23;
 Wed,  5 Aug 2015 05:27:39 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from ralph.baldwin.cx (75-48-78-19.lightspeed.cncrca.sbcglobal.net
 [75.48.78.19])
 by bigwig.baldwin.cx (Postfix) with ESMTPSA id F20CCB915;
 Wed,  5 Aug 2015 01:27:37 -0400 (EDT)
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
Date: Tue, 04 Aug 2015 22:00:06 -0700
Message-ID: <1687842.Wj34XYKLi4@ralph.baldwin.cx>
User-Agent: KMail/4.14.3 (FreeBSD/10.2-PRERELEASE; KDE/4.14.3; amd64; ; )
In-Reply-To: <20150726012619.GP21594@ivaldir.etoilebsd.net>
References: <20150726012619.GP21594@ivaldir.etoilebsd.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
 (bigwig.baldwin.cx); Wed, 05 Aug 2015 01:27:38 -0400 (EDT)
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current/>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Aug 2015 05:27:39 -0000

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