feat(stack sync): auto rebase branches after merge #56
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
added 4 commits
August 10, 2022 15:46
…trunk-commit parent- branch current-branch'; added trunk commit information to the branch meta data so that we can more easily find when a PR has been merged in; also moved the skip sync logic on merged branch to always happen not just on no-fetch=false
… head of trunk then we make a new trunk branch so that branch/stack behavior continues to work as expected
ghost
commented
Aug 11, 2022
ghost
commented
Aug 11, 2022
…ously was not exhaustive (even if it actually was and it is really just that the compiler can't tell)
twavv
reviewed
Aug 11, 2022
Contributor
twavv
left a comment
There was a problem hiding this comment.
I think reparenting is maybe not quite the right approach here (at least semantically). I think a "vanilla rebase" is going to be a simpler thing to do (at least conceptually). Happy to elaborate more if that's not totally clear.
added 8 commits
August 11, 2022 19:47
…that we just always get the merge commit information for every PR rather than have it be a standalone thing
…gets correctly updated in GH
… rev-parse, etc work correctly
twavv
approved these changes
Aug 17, 2022
Contributor
twavv
left a comment
There was a problem hiding this comment.
Looks good! Few minor comments. I assume you've tested this.
twavv
reviewed
Aug 17, 2022
added 2 commits
August 17, 2022 17:24
…ate again - did operation out explicitly rather than calling function
… be using internally
Contributor
Aviator status
This PR was merged using Aviator. |
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.
What changed
auto-rebaseonto the trunk committctcis the HEAD of trunk, then we simply reparent to trunktcis not the HEAD of trunk, then we create a new branch with its HEAD attcand reparent to that branch so that stacks continue to work as normaloidfor both the standardMERGEcase, as well as theFAST FORWARDcase.GetClientfunction that lazy inits the GitHub client withsync.Once- switched all functions to use this method but left the oldNewClientmethod present if we need it for some reason.Testing
Ran the following as a test:
stack submitto create PRs for the full stack:/aviator stack mergeon the second PR in the stack leaving the 3rd PR needing to be reparented:stack syncand saw the 3rd PR in the stack get auto-rebased:git push --force-with-lease origin mq-test-619133-3manually because this wasn't yet part of the auto-rebase process (although it now has been added as a step in the code)stack submitand correctly see the PR updated to be on top ofmain: