[CI] aggregate: dedup docsource module rows before force-push - #104
Merged
Conversation
Each merged migration branch marks its modules in docsource/modules180-190.rst, so gitaggregate replays one row per branch that touches a module — 13 modules ended up with duplicate rows on aggregated (16 surplus rows). Duplicates make the coverage table unreadable and let a blank row mask a marked one. New step collapses to the first occurrence per module (preferring a marked row over a blank) and commits onto the aggregated HEAD that gets force-pushed. Per-branch diffs are untouched; the dedup lives only on the throwaway aggregated tree.
dnplkndll
added a commit
that referenced
this pull request
Jun 3, 2026
Each merged migration branch marks its modules in docsource/modules180-190.rst, so gitaggregate replays one row per branch that touches a module — 13 modules ended up with duplicate rows on aggregated (16 surplus rows). Duplicates make the coverage table unreadable and let a blank row mask a marked one. New step collapses to the first occurrence per module (preferring a marked row over a blank) and commits onto the aggregated HEAD that gets force-pushed. Per-branch diffs are untouched; the dedup lives only on the throwaway aggregated tree.
dnplkndll
added a commit
that referenced
this pull request
Jun 14, 2026
Each merged migration branch marks its modules in docsource/modules180-190.rst, so gitaggregate replays one row per branch that touches a module — 13 modules ended up with duplicate rows on aggregated (16 surplus rows). Duplicates make the coverage table unreadable and let a blank row mask a marked one. New step collapses to the first occurrence per module (preferring a marked row over a blank) and commits onto the aggregated HEAD that gets force-pushed. Per-branch diffs are untouched; the dedup lives only on the throwaway aggregated tree.
dnplkndll
added a commit
that referenced
this pull request
Jun 19, 2026
Each merged migration branch marks its modules in docsource/modules180-190.rst, so gitaggregate replays one row per branch that touches a module — 13 modules ended up with duplicate rows on aggregated (16 surplus rows). Duplicates make the coverage table unreadable and let a blank row mask a marked one. New step collapses to the first occurrence per module (preferring a marked row over a blank) and commits onto the aggregated HEAD that gets force-pushed. Per-branch diffs are untouched; the dedup lives only on the throwaway aggregated tree.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds a dedup step to
aggregate.ymlbetween gitaggregate and the force-push.Why. Every merged migration branch marks its modules in
docsource/modules180-190.rst. gitaggregate replays each branch's edit verbatim, so a module touched by N branches gets N rows. On the currentaggregatedthat's 13 modules with duplicate rows (16 surplus). The duplicates make the coverage table unreadable and, worse, let a later blank row mask an earlier marked one when reading status.What. A new "Dedup docsource module rows" step collapses each module to its first occurrence, preferring a marked row over a blank, then commits onto the aggregated HEAD that gets force-pushed. It runs only on the throwaway
aggregatedtree — per-branch diffs (the upstream-bound artifacts) are untouched.Validated against the live
aggregateddocsource: 13 dup modules → 0, 16 rows dropped, 556 modules preserved, and zero module that was marked anywhere ends up blank.