From owner-svn-src-head@freebsd.org  Fri Aug  5 21:11:39 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 B7187BB0087;
 Fri,  5 Aug 2016 21:11: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 93F341EED;
 Fri,  5 Aug 2016 21:11:39 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from ralph.baldwin.cx (c-73-231-226-104.hsd1.ca.comcast.net
 [73.231.226.104])
 by bigwig.baldwin.cx (Postfix) with ESMTPSA id 648F4B93A;
 Fri,  5 Aug 2016 17:11:38 -0400 (EDT)
From: John Baldwin <jhb@freebsd.org>
To: Baptiste Daroussin <bapt@freebsd.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: Re: svn commit: r303784 - head/usr.sbin/etcupdate
Date: Fri, 05 Aug 2016 14:11:04 -0700
Message-ID: <3736754.gl7IgcC6z2@ralph.baldwin.cx>
User-Agent: KMail/4.14.3 (FreeBSD/10.3-STABLE; KDE/4.14.3; amd64; ; )
In-Reply-To: <201608051922.u75JMXVt009561@repo.freebsd.org>
References: <201608051922.u75JMXVt009561@repo.freebsd.org>
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); Fri, 05 Aug 2016 17:11:38 -0400 (EDT)
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Aug 2016 21:11:39 -0000

On Friday, August 05, 2016 07:22:33 PM Baptiste Daroussin wrote:
> Author: bapt
> Date: Fri Aug  5 19:22:33 2016
> New Revision: 303784
> URL: https://svnweb.freebsd.org/changeset/base/303784
> 
> Log:
>   etcupdate: directly use diff3(1) instead of merge(1)
>   
>   During the last attempt to rmeove GNU rcs, 2 blockers were spotted:
>   We need an ident(1) and etcupdate(8) uses merge(1).
>   
>   Now nothing should prevent to remove rcs from base
>   
>   Reviewed by:	jhb
>   Differential Revision:	https://reviews.freebsd.org/D7401

Thanks for cleaning this up!

-- 
John Baldwin