Skip to content

"Parent check" improvements (support for backport branches + "recursive" check) - #1077

Open
thbar wants to merge 2 commits into
v2.0from
fix/parent-branch-check
Open

thbar wants to merge 2 commits into
v2.0from
fix/parent-branch-check

Conversation

@thbar

@thbar thbar commented Sep 19, 2026

Copy link
Copy Markdown
Contributor

In this PR:

  1. Make sure that backport PRs (such as Backport #1074 to v2.1-wip #1076) are not blocked by the parent check
  • Before: only the target branch was compared to its parent (commits brought by the PR itself were not included in the comparison, causing backport branches to be blocked).
  • After: commits brought in by the PR itself are included in the comparison.
  1. Make sure that v3.0-wip is "recursively" up-to-date from v2.0
  • Before: the test would be green if v3.0-wip is up-to-date from v2.1-wip, but v2.1-wip is not itself up-to-date from v2.0
  • After: both parents are checked

Testing

The script was run locally against the real merge refs of #1076 (passes), #1068 and #981 (still blocked while v2.1-wip is behind, pass once it is synced).

The first real run will be #1076, after v2.0 is merged into its branch again.

Before: only the target branch was compared to its parent, so backport PRs were blocked too (see #1076).
After: commits brought in by the PR itself are included in the comparison.

@TuThoThai TuThoThai left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this @thbar!

@thbar

thbar commented Sep 19, 2026

Copy link
Copy Markdown
Contributor Author

A good way to review is to go commit by commit:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants