repo sync: don't propagate downstack history for unsubmitted branches #527
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
|
This change is part of the following stack: Change managed by git-spice. |
This was referenced Dec 21, 2024
When bubbling up downstack history, don't nuke the history of a merged branch until it's deleted. If this branch fails to be deleted/untracked for any reason, we'll still have this history to work with.
Add a test for how merge history propagation behaves for upstack branches that are unsubmitted. Suppose I have `feat1 -> feat2`: - feat1 is ready and I submit a CR - feat2 is not yet ready for review, so it is unsubmitted - while I'm still working on feat2, feat1 gets approved and I merge it - I then submit feat2 Right now--by accident--it works so that feat2 receives the history: it will show feat1 as its merged downstack even though feat1 was merged by the time feat2 was restacked on main and submitted. My intuition is that this should NOT be supported, but it's also coming mostly for "free". I'm opening up this PR and test case to discuss this behavior with anyone who cares.
abhinav
force-pushed
the
repo-sync-dont-nuke-merged-history
branch
from
8f3612b to
4ff4b61
Compare
abhinav
force-pushed
the
nav-history-unsubmitted-test
branch
from
27e1114 to
2e3cdde
Compare
abhinav
changed the title
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.
Add a test for how merge history propagation behaves
for upstack branches that are unsubmitted.
Suppose I have
feat1 -> feat2:feat2 still shows feat1 in its downstack history.
We can change this behavior in the future if it makes sense
but right now I lean towards more information over less.