From owner-freebsd-current@freebsd.org Sun Jul 26 01:26:28 2015 Return-Path: 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 5FEF69A5FE4 for ; Sun, 26 Jul 2015 01:26:28 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mailman.ysv.freebsd.org (mailman.ysv.freebsd.org [IPv6:2001:1900:2254:206a::50:5]) by mx1.freebsd.org (Postfix) with ESMTP id 3EB32D53 for ; Sun, 26 Jul 2015 01:26:28 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: by mailman.ysv.freebsd.org (Postfix) id 3B5FF9A5FE3; Sun, 26 Jul 2015 01:26:28 +0000 (UTC) Delivered-To: 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 3AEF29A5FE2 for ; Sun, 26 Jul 2015 01:26:28 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-wi0-x22d.google.com (mail-wi0-x22d.google.com [IPv6:2a00:1450:400c:c05::22d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C85E9D52 for ; Sun, 26 Jul 2015 01:26:27 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: by wicmv11 with SMTP id mv11so100409764wic.0 for ; Sat, 25 Jul 2015 18:26:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=LurnA83PY8/9CWtAnGjKOS9jPrF4940VC+FS5Ity2zQ=; b=Ph0khMjZd14j/LXcP0GKtiIdYYxKgNlEz107BjhUcFkcwSgFUa0GWHjDfmjbaI3M4P b+Y/W8yGspTxeeVVB48iBPermvJdkVORR70exC5ptf0czG2DC4txOoSI+HZRZAMXU8D4 Z2R5zamvL8qS8WIFIZNE82LXtph91C6b59jAMBvDBlFRriPmCaxPw4Kz5NHhgxhcBVIT TqgKSWPCg8sWE32vCg5BlMOIogoL1dV41BsoM0pJ7RCqJdzupHutTOj7uBKd5WGb7+Jf inytktFcauJuP1EsUYTI3Q1Wu7bBhU+kvPFei1bl6PErarpDGFFwoFlXaHWFzNItwfUQ l4qA== X-Received: by 10.194.95.71 with SMTP id di7mr42243153wjb.125.1437873986373; Sat, 25 Jul 2015 18:26:26 -0700 (PDT) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by smtp.gmail.com with ESMTPSA id q19sm5823483wik.16.2015.07.25.18.26.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 Jul 2015 18:26:25 -0700 (PDT) Sender: Baptiste Daroussin Date: Sun, 26 Jul 2015 03:26:22 +0200 From: Baptiste Daroussin To: current@FreeBSD.org Subject: [CFT] rewrite of the merge(1) utility Message-ID: <20150726012619.GP21594@ivaldir.etoilebsd.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="H14uD12u8nekTETJ" Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Jul 2015 01:26:28 -0000 --H14uD12u8nekTETJ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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. Another bonus is merge -e is now working again (it is broken in base from my testings). It should be able to replace entirely GNU RCS merge(1). From my testing only one output with co(1) is slightly different but harmless. I would appreciate more testing in particular from rcs(1). (No I have no intention to rewrite ci(1), co(1) or rcs*) Best regards, Bapt --H14uD12u8nekTETJ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlW0NzsACgkQ8kTtMUmk6Ez0QACffx3NuvTk91ydOqfVqkzirfYv vKcAniBBbTSI+dIPjN3yF26nfGzN3Mmt =16C9 -----END PGP SIGNATURE----- --H14uD12u8nekTETJ--