Page MenuHomeFreeBSD
Differential D37368

gnu diff3: apply patch to committed src, rather than at build time
ClosedPublic
Actions

Authored by emaste on Nov 11 2022, 7:51 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Dec 14, 4:04 AM
Unknown Object (File)
Mon, Nov 25, 1:29 AM
Unknown Object (File)
Nov 18 2024, 7:20 PM
Unknown Object (File)
Nov 18 2024, 4:35 AM
Unknown Object (File)
Nov 18 2024, 1:04 AM
Unknown Object (File)
Oct 29 2024, 12:57 PM
Unknown Object (File)
Sep 28 2024, 8:31 PM
Unknown Object (File)
Sep 25 2024, 11:59 PM
View All 75 Files
Subscribers
imp

Details

Reviewers
delphij
thj
Commits
rG62491112ae26: gnu diff3: apply patch to committed src, rather than at build time
rG3a13b5ac83a1: gnu diff3: apply patch to committed src, rather than at build time
Summary

This looks like a leftover from an era of a less-capable VCS.

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

emaste requested review of this revision.Nov 11 2022, 7:51 PM
emaste created this revision.
delphij accepted this revision.Nov 11 2022, 8:56 PM

(I thought the GNU diff3 was replaced by a BSD licensed implementation a few years ago! LGTM...)

This revision is now accepted and ready to land.Nov 11 2022, 8:56 PM
emaste added a comment.Nov 11 2022, 10:12 PM

I thought the GNU diff3 was replaced by a BSD licensed implementation a few years ago!

We have a BSD licensed implementation that came via GSoC, but it's not complete and isn't used by default. @thj mentioned on IRC that they're working on updating it.

I spotted this patch file while trying to evaluate the current GNU diff3.

Closed by commit rG3a13b5ac83a1: gnu diff3: apply patch to committed src, rather than at build time (authored by emaste). · Explain WhyNov 14 2022, 2:34 AM
This revision was automatically updated to reflect the committed changes.
emaste added a commit: rG3a13b5ac83a1: gnu diff3: apply patch to committed src, rather than at build time.
Herald added a subscriber: imp. · View Herald TranscriptNov 14 2022, 2:34 AM
emaste added a commit: rG62491112ae26: gnu diff3: apply patch to committed src, rather than at build time.Nov 19 2022, 7:11 PM

Revision Contents
Changeset List

PathSize
contrib/
diff/
src/
1 line
gnu/
usr.bin/
diff3/
6 lines

Diff 113010

View Options

contrib/diff/src/diff3.c

Loading...
View Options

gnu/usr.bin/diff3/Makefile

Loading...
View Options

gnu/usr.bin/diff3/diff3.c.diff

Loading...