ci(forks): rebase OpenUpgrade feature branches nightly - #14
Closed
dnplkndll wants to merge 1 commit into
Closed
Conversation
OpenUpgrade carries ~30 not-yet-merged 19.0-mig-* / 19.0-fix-* branches against a base that moved 200+ commits in five weeks, so they silently rotted. Conflicts are reported and never pushed, which suits this fork: a conflict there usually means upstream has since done that module. Assisted-by: Claude Opus 5
Contributor
Author
|
Duplicate of #11, which predates this by six weeks and is strictly better — it also rebases the Today's sweep is supporting evidence for #11: the 30 open OpenUpgrade feature branches were 33–211 commits behind |
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.
ledoent/OpenUpgradeis the only fork carrying a large set of long-livedfeature branches without
rebase_globs, so nothing kept them on an advancingbase. Measured today before this change: branches were 33–211 commits behind
OCA/19.0.Rebasing all 30 by hand just now: 22 clean, 5 conflicts, 3 already current.
The 5 conflicts are all modules upstream has since migrated itself — which is
exactly why
rebase_globsreports conflicts rather than pushing them.Same globs already used by another fork in this file.
test_load_forks.pyandtest_rebase_feature_branches.pypass.AI-assisted (Claude Code); every change reviewed, tested, and owned by the author.