Page MenuHomeFreeBSD
Differential D46762

diff3: Fix merge mode.
ClosedPublic
Actions

Authored by des on Sep 23 2024, 2:51 PM.
Tags
None
Referenced Files
F132301326: D46762.id143641.diff
Wed, Oct 15, 4:43 PM
Unknown Object (File)
Sat, Oct 11, 12:30 AM
Unknown Object (File)
Fri, Oct 10, 9:01 PM
Unknown Object (File)
Tue, Sep 30, 10:16 AM
Unknown Object (File)
Thu, Sep 25, 4:50 PM
Unknown Object (File)
Wed, Sep 24, 9:23 PM
Unknown Object (File)
Tue, Sep 23, 2:19 AM
Unknown Object (File)
Sep 11 2025, 9:24 AM
View All 73 Files
Subscribers
imp

Details

Reviewers
thj
Group Reviewers
Klara
Commits
rGcf73401c4f7a: diff3: Fix merge mode.
Summary

This is mostly thj@'s work, with some tweaks and cleanup by me. There
are still some cases where our output differs from GNU diff3, but it's
much better than before and I'd rather commit what I have now than let
it continue to languish in a metaphorical drawer.

MFC after 3 weeks
Sponsored by: Klara, Inc.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

des created this revision.Sep 23 2024, 2:51 PM
Herald added a subscriber: imp. · View Herald TranscriptSep 23 2024, 2:51 PM
des requested review of this revision.Sep 23 2024, 2:51 PM
Harbormaster completed remote builds in B59569: Diff 143637.Sep 23 2024, 2:51 PM
des updated this revision to Diff 143641.Sep 23 2024, 5:56 PM

because

Harbormaster completed remote builds in B59570: Diff 143641.Sep 23 2024, 5:56 PM
des updated this revision to Diff 143642.Sep 23 2024, 5:57 PM

nit

Harbormaster completed remote builds in B59571: Diff 143642.Sep 23 2024, 5:57 PM
thj accepted this revision.Sep 24 2024, 8:44 AM

Looks like an improvement to me, the big comment helps.

Can you bump diff3_version, I think it will help a lot in tracking bug reports.

I would like us to have more tests, but I know how difficult they are to put together.

This revision is now accepted and ready to land.Sep 24 2024, 8:44 AM
Closed by commit rGcf73401c4f7a: diff3: Fix merge mode. (authored by des). · Explain WhySep 25 2024, 5:15 PM
This revision was automatically updated to reflect the committed changes.
des added a commit: rGcf73401c4f7a: diff3: Fix merge mode..

Revision Contents
Changeset List

PathSize
usr.bin/
diff3/
255 lines

Diff 143725

View Options

usr.bin/diff3/diff3.c

Loading...