From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <9front-bounces@9front.inri.net>
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4
Received: from 9front.inri.net (9front.inri.net [168.235.81.73])
	by inbox.vuxu.org (Postfix) with ESMTP id 3007624A23
	for <ml@inbox.vuxu.org>; Mon, 22 Jan 2024 13:02:55 +0100 (CET)
Received: from mimir.eigenstate.org ([206.124.132.107]) by 9front; Mon Jan 22 07:00:57 -0500 2024
Received: from mimir.eigenstate.org (localhost [127.0.0.1])
	by mimir.eigenstate.org (OpenSMTPD) with ESMTP id 5715faba
	for <9front@9front.org>;
	Mon, 22 Jan 2024 04:00:54 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=eigenstate.org; h=
	message-id:to:subject:date:from:in-reply-to:mime-version
	:content-type:content-transfer-encoding; s=mail; bh=wz9mdIhwGaLO
	IVeWbvZ8ne9vocc=; b=jWfiay6kjRtTtgSQrn0Et6PHoJphX2DZ+FG+IgqPAkTK
	oZbId1S/65Tj1Rhqaw3hEzI1cVI7ttI/w+uAj+IpQxiR0bAvwXxd2TNulAMNuMHl
	3rCMlwSeqvApSjhJhsco/glSbzzUIQ4WXy/lbv1gzWJ1CTLSuGYoFvbEYyUC/YE=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=eigenstate.org; h=message-id
	:to:subject:date:from:in-reply-to:mime-version:content-type
	:content-transfer-encoding; q=dns; s=mail; b=de11p9wgqWEBu9YbSXG
	guk7ttSMjCpjDOUgjIWcOGPd7biSKKR8KdTcKYTT1cRuCCYckq/N9979/27220qe
	inGizXtEpop6NgUAGjVcEm9XZYu/yE3TY6bUFH3M2x+Cp/VrMc3VvEcuAvNN+Kjl
	47Id80z5Y2LjVZ4/X/vZ2oS4=
Received: from stockyard (lmontsouris-659-1-123-213.w82-127.abo.wanadoo.fr [82.127.239.213])
	by mimir.eigenstate.org (OpenSMTPD) with ESMTPSA id 9ab9dc5f (TLSv1.2:ECDHE-RSA-AES256-SHA:256:NO)
	for <9front@9front.org>;
	Mon, 22 Jan 2024 04:00:53 -0800 (PST)
Message-ID: <752FCD171F7EDD5936E90B789923F269@eigenstate.org>
To: 9front@9front.org
Date: Mon, 22 Jan 2024 07:00:50 -0500
From: ori@eigenstate.org
In-Reply-To: <83D5720B7674D9BDA3CFE64D9CB77A88@eigenstate.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="US-ASCII"
Content-Transfer-Encoding: 7bit
List-ID: <9front.9front.org>
List-Help: <http://lists.9front.org>
X-Glyph: ➈
X-Bullshit: social rich-client-scale blockchain YAML over AJAX map/reduce engine 
Subject: Re: [9front] deleting ape/diff3, ape/diff, and ape/patch?
Reply-To: 9front@9front.org
Precedence: bulk

Also, for people doing a lot of diffing and merging, if
you could test out the following diff and report back
on any issues, I would appreciate that:


diff 26c21f9b5d06296d13f40b53de14e22007e189c2 uncommitted
--- a/sys/lib/git/common.rc
+++ b/sys/lib/git/common.rc
@@ -87,7 +87,7 @@
 
 	if(mergeperm $ours $base $theirs){
 		mkdir -p `{basename -d $tmp}
-		if(! ape/diff3 -3 -m $ours $base $theirs > $tmp)
+		if(! merge3 $ours $base $theirs > $tmp)
 			echo merge needed: $out >[1=2]
 		mv $tmp $out
 		git/add $out

Quoth ori@eigenstate.org:
> As of the last commit to cmd/diff/merge3, we should have
> a usable native 3-way merge in tree. Barring bugs, it
> should be able to do all that our in-tree scripts need.
> 
> As a result, I'd like to remove the buggy, crashy, and
> obsolte ape/patch, ape/diff, and ape/diff3 utilities
> from our tree by default, and move it into an extrenal
> repository, where it will be just as well maintaned as
> it was in-tree.
> 
> Are there any people currently using them in scripts?
> Are there any missing features that would prevent a
> transition of them to the native tools?
> 
> We will be losing the ability to apply non-unified
> patches.
> 
> Are there any other objections?
>