Script to ghstack land #6265
Closed
Script to ghstack land #6265
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
🔗 Helpful Links🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/6265
Note: Links to docs will display an error until the docs builds have been completed. ✅ No FailuresAs of commit b59a875 with merge base 7510f8c ( This comment was automatically generated by Dr. CI and updates every 15 minutes. |
facebook-github-bot
added
the
CLA Signed
This was referenced Oct 16, 2024
Closed
Closed
Closed
Closed
This was referenced Oct 16, 2024
Closed
Closed
Closed
Closed
Closed
This was referenced Oct 16, 2024
Closed
Closed
Closed
Closed
Closed
kirklandsign
had a problem deploying
to
cherry-pick-bot
GitHub Actions
Failure
Closed
kirklandsign
had a problem deploying
to
cherry-pick-bot
GitHub Actions
Failure
kirklandsign
temporarily deployed
to
cherry-pick-bot
GitHub Actions
Inactive
kirklandsign
temporarily deployed
to
cherry-pick-bot
GitHub Actions
Inactive
facebook-github-bot
pushed a commit
that referenced
this pull request
Oct 17, 2024
Summary: Per ghstack [tutorial](https://github.com/ezyang/ghstack/blob/master/README.md#structure-of-submitted-pull-requests) for a PR exported by ghstack, it will have two diff sets: - `gh/user/1/base <- gh/user/1/head` where the PR is created like [this](#6265) - `main <- gh/user/1/orig` The purpose of this bot is, when the ghstack PR is merged, automatically create another PR to do this merge `main <- gh/user/1/orig`. Then we just merge the newly created PR so that `main` has that change. Missing piece: token from pytorch bot to create PR. If this goes well, we can either `git merge` the commit from gh/user/1/orig into main directly, without going through the new PR; or auto approve and merge the PR. Pull Request resolved: #6270 Test Plan: You can test locally with `export GITHUB_TOKEN=ghpxyz; python .github/scripts/propose_ghstack_orig_pr.py --pr 6265 --repo pytorch/executorch` Note that between /orig merges, there is never a merge conflict. The invariant is guaranteed that gh/user/1/orig contains the exact same change between `gh/user/1/base <- gh/user/1/head` by ghstack tool. Reviewed By: huydhn Differential Revision: D64569002 Pulled By: kirklandsign fbshipit-source-id: 9af16e3d292a1c835b98b345efaca8946593c9ed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Per ghstack tutorial for a PR exported by ghstack, it will have two diff sets:
gh/user/1/base <- gh/user/1/headwhere the PR is created like thismain <- gh/user/1/origThe purpose of this bot is, when the ghstack PR is merged, automatically create another PR to do this merge
main <- gh/user/1/orig. Then we just merge the newly created PR so thatmainhas that change.Missing piece: token from pytorch bot to create PR.
If this goes well, we can either
git mergethe commit from gh/user/1/orig into main directly, without going through the new PR; or auto approve and merge the PR.Test: You can test locally with
export GITHUB_TOKEN=ghpxyz; python .github/scripts/propose_ghstack_orig_pr.py --pr 6265 --repo pytorch/executorchNote that between /orig merges, there is never a merge conflict.
The invariant is guaranteed that gh/user/1/orig contains the exact same change between
gh/user/1/base <- gh/user/1/headby ghstack tool.Stack from ghstack (oldest at bottom):