Comments (3)
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?
from spr.
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.
from spr.
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
from spr.
Related Issues (20)
- Multiple stacks of work? HOT 1
- [question] Any way to support squash merging PR in GitHub UI and then update locally?
- [feature request] Show stack in PR
- [Critical Bug] Error when updating an existing PR HOT 4
- spr list (and land) PR statuses are always PENDING HOT 1
- Formula Name Conflict Between Two Projects
- Maintenance status HOT 1
- spr diff uses jujutsu to amend? HOT 4
- Changing Base Branche Dismisses the Reviewers' Approval
- `an unknown git error occurred; code=NotFound (-3)` HOT 1
- Please update the ring crate to 17.x
- Support specification of branch name in `spr diff` HOT 1
- Remove "Reviewers:" for `spr land` HOT 2
- Support for Bitbucket and others?
- invalid data in index - calculated checksum does not match expected; class=Index (10) HOT 1
- Use spr and bors together HOT 2
- Spr doesn't recognize existing commits/PRs
- feat(cli): support `githubMasterBranch` from CLI
- [docs] Need clarification on how to insert a commit into the middle of an ongoing stacked PR review
- Documentation Webpage returning 404 from Github Pages HOT 1
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from spr.