* [9front] deleting ape/diff3, ape/diff, and ape/patch?
@ 2024-01-21 3:16 ori
2024-01-22 12:00 ` ori
2024-01-22 15:02 ` Jacob Moody
0 siblings, 2 replies; 3+ messages in thread
From: ori @ 2024-01-21 3:16 UTC (permalink / raw)
To: 9front
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?
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [9front] deleting ape/diff3, ape/diff, and ape/patch?
2024-01-21 3:16 [9front] deleting ape/diff3, ape/diff, and ape/patch? ori
@ 2024-01-22 12:00 ` ori
2024-01-22 15:02 ` Jacob Moody
1 sibling, 0 replies; 3+ messages in thread
From: ori @ 2024-01-22 12:00 UTC (permalink / raw)
To: 9front
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?
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [9front] deleting ape/diff3, ape/diff, and ape/patch?
2024-01-21 3:16 [9front] deleting ape/diff3, ape/diff, and ape/patch? ori
2024-01-22 12:00 ` ori
@ 2024-01-22 15:02 ` Jacob Moody
1 sibling, 0 replies; 3+ messages in thread
From: Jacob Moody @ 2024-01-22 15:02 UTC (permalink / raw)
To: 9front
I am very much in favor of killing these ape programs,
the less ape the better.
Thanks for your work in making that possible.
As a side note it would be nice to have some
inventory of what we still rely on that is using
ape. My initial guess would be just gs but I think
there is some more.
On 1/20/24 21:16, ori@eigenstate.org wrote:
> 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?
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-01-22 15:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-21 3:16 [9front] deleting ape/diff3, ape/diff, and ape/patch? ori
2024-01-22 12:00 ` ori
2024-01-22 15:02 ` Jacob Moody
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).