Page MenuHomeFreeBSD

mfc-candidates: fix output order for incorrect commit dates
ClosedPublic

Authored by emaste on Apr 16 2024, 4:18 PM.
Tags
None
Referenced Files
F102184008: D44808.id137108.diff
Fri, Nov 8, 3:35 PM
F102167795: D44808.id137105.diff
Fri, Nov 8, 11:09 AM
F102139946: D44808.id137115.diff
Fri, Nov 8, 2:55 AM
Unknown Object (File)
Thu, Nov 7, 4:44 PM
Unknown Object (File)
Thu, Nov 7, 4:43 PM
Unknown Object (File)
Sun, Oct 20, 6:10 AM
Unknown Object (File)
Sep 30 2024, 7:01 AM
Unknown Object (File)
Sep 22 2024, 7:57 PM
Subscribers

Details

Summary

Previously we obtained the list of MFC candidate hashes (i.e., those commits only in the "MFC from" branch), removed the already merged commits, and then printed the list sorted by commit time. This is usually the correct order, unless commits have non-monotonically-increasing commit times. Unfortunately this is true for a number of commits in our tree. This made it difficult to merge some groups of related commits.

Instead, keep the from-list and to-list in git rev-parse order, and move the matching logic to a new lua script.

Diff Detail

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

Event Timeline

emaste created this revision.
emaste added a subscriber: bz.

rename function to be more generic

By default git rev-list is in reverse chronological order. Add --reverse to print it in chronological order.

Thanks! That's awesome service

This revision is now accepted and ready to land.Apr 16 2024, 5:36 PM