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

Is there a way for others to check out my stacked diffs? #155

Open
opqpop opened this issue Feb 23, 2023 · 3 comments
Open

Is there a way for others to check out my stacked diffs? #155

opqpop opened this issue Feb 23, 2023 · 3 comments

Comments

@opqpop
Copy link

opqpop commented Feb 23, 2023

Teammates told me they can't check out my unapproved stacked diffs. Say I have stacked diffs: diff1 -> diff2 -> diff3 -> diff4, and none of them are approved yet. What's the best way someone can check out all these changes so they can play with HEAD pointing to diff4, and having all changes including diff1, diff2, diff3?

@hansbogert
Copy link

I only did simple stuff like following the manual, but wouldn't you just push everything up to diff4 to a branch? But if they're highly coupled commits, why have them in separate commits?

@spacedentist
Copy link
Collaborator

If 1, 2, 3, 4 are the PR numbers of your diffs, you can use spr patch 4 - this will create a local branch for you with two commits on it: the top one contains the changes in diff4, the one below contains all the changes in the base (i.e. diff1,2,3 combined).

There is no command that recreates the branch with four commits for you. spr doesn't really think of stacks, it handles every PR completely independent of all other PRs. It does however distinguish between PRs that are directly branched off your master branch (that would be your diff1), and PRs that are based on changes that are not in the master branch yet (that would be your diff2, diff3, diff4).

I'm not saying this is something that we be impossible to do, just that spr doesn't have that functionality.

@opqpop
Copy link
Author

opqpop commented Apr 26, 2023

Gotcha! Thanks, spr patch 4 will work for us! Glad there was a way to do it :)

But if they're highly coupled commits, why have them in separate commits?
Ah, this is the main reason I use spr, to make a lot of stacked diffs. Let me know if I'm misunderstanding something

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

3 participants