From owner-freebsd-current@freebsd.org  Thu Aug 13 13:13:53 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 6C7139A0D58;
 Thu, 13 Aug 2015 13:13:53 +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 29D3D7A3;
 Thu, 13 Aug 2015 13:13:53 +0000 (UTC) (envelope-from slw@zxy.spb.ru)
Received: from slw by zxy.spb.ru with local (Exim 4.84 (FreeBSD))
 (envelope-from <slw@zxy.spb.ru>)
 id 1ZPsKF-000DBY-LX; Thu, 13 Aug 2015 16:13:43 +0300
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>
References: <20150726012619.GP21594@ivaldir.etoilebsd.net>
 <1687842.Wj34XYKLi4@ralph.baldwin.cx>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1687842.Wj34XYKLi4@ralph.baldwin.cx>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-SA-Exim-Connect-IP: <locally generated>
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
 <freebsd-current.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Aug 2015 13:13:53 -0000

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?