-
Notifications
You must be signed in to change notification settings - Fork 87
Open
Labels
bugSomething isn't workingSomething isn't working
Description
Recently using spr and found that after managing my stack and getting it ready it failed to close/merge all PR's.
Process:
- Check status
$ git spr status
▸ git spr status
> git rev-parse --show-toplevel
> github fetch pull requests
> git log --format=medium --no-color origin/main..HEAD
> git branch --no-color
┌─ github checks pass
│ ┌── pull request approved
│ │ ┌─── no merge conflicts
│ │ │ ┌──── stack check
│ │ │ │
[✅✅✅✅] https://github.com/dekimsey/example/pull/79 : Cool PR 7
[✅✅✅✅] https://github.com/dekimsey/example/pull/78 : Cooler PR 6
[✅✅✅✅] https://github.com/dekimsey/example/pull/77 : Cooled PR 5
[✅✅✅✅] https://github.com/dekimsey/example/pull/76 : Coolest PR 4
[✅✅✅✅] https://github.com/dekimsey/example/pull/75 : Colder PR 3
[✅✅✅✅] https://github.com/dekimsey/example/pull/74 : Freezing PR 2
[✅✅✅✅] https://github.com/dekimsey/example/pull/73 : Frozen PR 1
- Run check
$ git spr check
> git rev-parse --show-toplevel
> git log --format=medium --no-color origin/main..HEAD
> github fetch pull requests
> git log --format=medium --no-color origin/main..HEAD
> git branch --no-color
MergeCheck PASSED
- Merge!
$ git spr merge
> git rev-parse --show-toplevel
> github fetch pull requests
> git log --format=medium --no-color origin/main..HEAD
> git branch --no-color
> git log --format=medium --no-color origin/main..HEAD
> github update 79 : Add logging initialization to root cmd
> github merge 79 : Add logging initialization to root cmd
MERGED ⚠️ https://github.com/dekimsey/example/pull/79 : Cool PR 7
> git fetch
> git rebase origin/main --autostash
> github fetch pull requests
> git log --format=medium --no-color origin/main..HEAD
> git branch --no-color
> git log --format=medium --no-color origin/main..HEAD
> git status --porcelain --untracked-files=no
> git stash
> git stash pop
> github fetch pull requests
> git log --format=medium --no-color origin/main..HEAD
> git branch --no-color
pull request stack is empty
- All previous PR's are still open untouched, no error. It's not clear to me where the ball is dropped here.
Configuration:
repository config
# git rebase --exec 'make go/test' origin/main
githubRepoOwner: dekimsey
githubRepoName: example
githubHost: github.com
githubRemote: origin
githubBranch: main
requireChecks: true
requireApproval: true
mergeMethod: rebase
mergeQueue: true
mergeCheck: true
forceFetchTags: false
showPrTitlesInStack: true
branchPushIndividually: falseNote: it's possibly my token is the problem, but I couldn't find docs on what privileges it needs so I guessed pull_request and repo content related access and that's appeared to work fine.
Metadata
Metadata
Assignees
Labels
bugSomething isn't workingSomething isn't working