Add PR skip detection, conflict reporting, and cherry-pick support#583
Open
nocturnalastro wants to merge 2 commits intoopenshift:mainfrom
Open
Add PR skip detection, conflict reporting, and cherry-pick support#583nocturnalastro wants to merge 2 commits intoopenshift:mainfrom
nocturnalastro wants to merge 2 commits intoopenshift:mainfrom
Conversation
When PRs are skipped, the script cherry-picks only kept merge commits (with -m 1) onto the downstream branch instead of pointing at upstream HEAD. Merge conflicts are detected and reported in the PR body. Skip detection layers: 1. SKIP_PRS / SKIP_COMMITS env vars for manual exclusion 2. Automatic: PRs whose files don't exist downstream are skipped 3. .upstream-sync-ignore file for path-based pattern exclusion Also updates the header docstring with all config options. Generated-by: Cursor
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: nocturnalastro The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
nocturnalastro
force-pushed
the
upstream_sync_with_auto_skip
branch
from
56b8703 to
76ae88c
Compare
Add automatic detection of upstream-only PRs (files not present downstream), .upstream-sync-ignore pattern matching, and manual SKIP_PRS/SKIP_COMMITS env vars. Skipped PRs are reverted on top of the full upstream history, preserving all original commit SHAs so git merge-base continues to work on subsequent runs. Revert commits are prefixed with "downstream-only:" for easy identification. Add --new-pr flag to force creating a new PR when lacking permissions to update an existing one, and --branch-suffix=TEXT to disambiguate branch names. Fix macOS compatibility: replace GNU sed multi-line join with portable paste+sed, and replace grep -oP with sed equivalents. Generated-by: Cursor Made-with: Cursor
nocturnalastro
force-pushed
the
upstream_sync_with_auto_skip
branch
from
76ae88c to
1074c25
Compare
Contributor
|
@nocturnalastro: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
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.
When PRs are skipped, the script cherry-picks only kept merge commits (with -m 1) onto the downstream branch instead of pointing at upstream HEAD. Merge conflicts are detected and reported in the PR body.
Skip detection layers:
Also updates the header docstring with all config options.
Generated-by: Cursor