Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Landed part of the stack gets lost after subsequent submit #53

Open
artempyanykh opened this issue Dec 6, 2024 · 1 comment
Open

Landed part of the stack gets lost after subsequent submit #53

artempyanykh opened this issue Dec 6, 2024 · 1 comment

Comments

@artempyanykh
Copy link

I'm not sure if this is by design or if I'm doing something wrong, so wanted to ask. I have this stack:

Screenshot 2024-12-06 at 23 10 49

After I stack-pr land the first PR, then did some rebasing and stack-pr submit again, the landed commit got removed from the stack in all subsequent PRs:
Screenshot 2024-12-06 at 23 12 08

Losing this piece of context feels unfortunate.

@ZolotukhinM
Copy link
Collaborator

This is the intended behavior, but I agree that it's somewhat unfortunate. The reason it behaves this way is because when you re-run stack-pr submit after the first PR has landed, the tool look at your branch, compares it to main and makes the stack to reflect that. At that point the difference between your branch and main no longer contains the already merged PR, so it's not included into the list (also, there might be already more commits in main on top of that landed one).

I understand though that it would be nice to preserve the relationship of PRs in the stack even after they landed - it's just non-trivial to come up with a robust and clear set of rules for that behavior, and then make sure everything remains consistent.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants