Re: [9front] deleting ape/diff3, ape/diff, and ape/patch?

[ori@eigenstate.org]

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?
>