Adjustment to merge-asset-tags
#7556
Merged
Conversation
This file contains 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
scbedd
requested review from
konrad-jamrozik,
weshaggard and
benbp
as code owners
|
The following pipelines have been queued for testing: |
konrad-jamrozik
approved these changes
Jan 20, 2024
benbp
approved these changes
Jan 20, 2024
This was referenced Jan 22, 2024
scbedd
added a commit
to Azure/azure-sdk-for-js
that referenced
this pull request
Jan 22, 2024
Sync eng/common directory with azure-sdk-tools for PR Azure/azure-sdk-tools#7556 See [eng/common workflow](https://github.com/Azure/azure-sdk-tools/blob/main/eng/common/README.md#workflow) Co-authored-by: Scott Beddall (from Dev Box) <[email protected]>
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.
Turns out, when a changeset includes the same changes, but a different parent commit,
cherry-pickkinda flips out with athen shows no modified files in
git status.Base commit: Automatic asset update from test-proxy. · Azure/azure-sdk-assets@c56e4d5 (github.com)
Mergee commit: Automatic asset update from test-proxy. · Azure/azure-sdk-assets@aa77628 (github.com)
Notice that the actual contents of the commits are the same, but the source it's coming from is not. This is the origin of the confusion for
cherry-pick.You can resolve this situation with a
git cherry-pick --skip, but why should you have to?I've adjusted the script to use
git merge, which absolutely does figure it out when the changes are identical and properly no-ops without getting into an error state.