[llvm][utils] skip revert-checking reverts across branches #134108
Merged
Conversation
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
e2ba1b6 references that it reverts a commit that's not a parent of e2ba1b6. Functionally, this can (and demonstrably does) work(*), but from the standpoint of the revert checker, it's nonsense. Print a `logging.error` when it's detected. Tested by running the revert checker against a commit range that includes the aforementioned commit; the logging.error was fired appropriately. (*) - the specifics here are: - the _SHA_ that was referenced was on a non-main branch, but - the commit from the non-main branch was merged into the non-main branch from main - ...so the _functional_ commit being reverted was originally landed on main, but the _SHA_ referenced from main was from a branch that was cut before the reverted-commit was landed on main
gburgessiv
force-pushed
the
llvmutils-skip-revert-checking-reverts-across-branches
branch
from
1faab91 to
9d09f33
Compare
ajordanr-google
approved these changes
Apr 2, 2025
|
Thanks for the quick review! This script is just for devs to run, so not covered by premerge checks, so I'm landing with those still pending. |
jrguzman-ms
pushed a commit
to msft-mirror-aosp/platform.external.toolchain-utils
that referenced
this pull request
Apr 17, 2025
This integrates the changes made in llvm/llvm-project#134108 BUG=b:407969361 TEST=None (though tested upstream before landing) Change-Id: I405a4124728a1c80b27777aa038dfa5c0f2e7387 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/6428392 Tested-by: George Burgess <[email protected]> Reviewed-by: Jordan Abrahams-Whitehead <[email protected]> Auto-Submit: George Burgess <[email protected]> Commit-Queue: Jordan Abrahams-Whitehead <[email protected]>
gburgessiv
deleted the
llvmutils-skip-revert-checking-reverts-across-branches
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
e2ba1b6 references that it reverts a commit that's not a parent of e2ba1b6.
Functionally, this can (and demonstrably does) work(*), but from the standpoint of the revert checker, it's nonsense. Print a
logging.errorwhen it's detected.Tested by running the revert checker against a commit range that includes the aforementioned commit; the logging.error was fired appropriately.
(*) - the specifics here are: