Build BSD diff3 if GNU diff3 is disabled.
AcceptedPublic
Actions

Authored by des on Thu, Sep 26, 9:30 PM.

Details

Reviewers

thj
bapt
kevans

Group Reviewers

Klara

Summary

MFC after: 3 weeks
Sponsored by: Klara, Inc.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 59608
Build 56495: arc lint + arc unit

Event Timeline

des created this revision.Thu, Sep 26, 9:30 PM

Herald added a subscriber: imp. · View Herald TranscriptThu, Sep 26, 9:30 PM

des requested review of this revision.Thu, Sep 26, 9:30 PM

Harbormaster completed remote builds in B59608: Diff 143766.Thu, Sep 26, 9:30 PM

kevans accepted this revision.Fri, Sep 27, 12:31 AM

This revision is now accepted and ready to land.Fri, Sep 27, 12:31 AM

While this review is ok I think we can only enable it when the etcupdate testsuite passes without error which is not the case yet, I 3 tests gnu diff3 manage to merge while bsd diff3 considers conflits: always_test:main, fbsdid_test:main, preworld_test:main, tests_test:main