-
Notifications
You must be signed in to change notification settings - Fork 64
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
upload: Add "branch-format" config option and commit tag #167
Conversation
Reviews in this chain: |
|
29f86bf
to
2d6c7c2
Compare
ff9c998
to
e0d33eb
Compare
2d6c7c2
to
573558f
Compare
e0d33eb
to
02f6d39
Compare
573558f
to
3a19895
Compare
3730eed
to
f60b13a
Compare
e370a37
to
8c17f14
Compare
f60b13a
to
051b8f7
Compare
8c17f14
to
9855223
Compare
83b6db2
to
62c9a47
Compare
9855223
to
c51d4cb
Compare
62c9a47
to
1a5080f
Compare
c51d4cb
to
c4ee1e2
Compare
1a5080f
to
a8eb317
Compare
c4ee1e2
to
7ce245c
Compare
5952c05
to
1ed3ddd
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does retargeting automatically with revup upload
have the problem of spamming codeowners for changes in between the merge-base of the new and old bases, and the original PR branch? It can't atomically push the branch and change the base branch in github right? I guess I'm a little worried about recommending this if it's going to spam people like that
It seems super annoying but I guess might be possible to
- upload the PR relative to the merge-base of the new and old base branches
- change the base branch via the github API
- maybe reupload on top of the actual new base branch
At least that's what I've done previously if I really wanted to retarget a PR
Branch-format will let you control how branches are named, which has an effect on when branches collide. This can be set on cmdline, from config file, or on a topic-by-topic basis inside the commit text. user+branch is the default today and will remain the default. Branch names will never collide if using this, but you cannot retarget to other base branches, and you must use Uploader: if another user wants to push to this branch. user allows retargeting prs to other base branches, but will not allow multiple base-branches to be specified. if they are, it will warn to specify user+branch instead. branch will allow others to upload to the same pr, but uploader: cannot be used. none includes both limitations and features of user and branch. I don't really believe there's good use cases for branch and none, but i'm implementing them to be complete. Fixes: #11
1ed3ddd
to
dfdff14
Compare
yes it probably will be spammy depending on which direction it retargets. ex 31.6-> master will be spammy because we need to push before updating the bb. the reverse will actually not be too spammy because with the new automerger we expect most of 31.6 to have merged into master already i don't want to cherry-pick onto the merge base though because it's possible that changes will cherry-pick cleanly on each branch but not on their merge base |
at this point i've seen enough limitations / spam in the codeowners system that i think the issue is more with it and not necessarily other tools. whether we recommend it is maybe a different question but i think it's useful enough that there should be some way for revup to configure it |
Branch-format will let you control how branches are named,
which has an effect on when branches collide. This can be
set on cmdline, from config file, or on a topic-by-topic
basis inside the commit text.
user+branch is the default today and will remain the default.
Branch names will never collide if using this, but you cannot
retarget to other base branches, and you must use Uploader: if
another user wants to push to this branch.
user allows retargeting prs to other base branches, but will
not allow multiple base-branches to be specified. if they are,
it will warn to specify user+branch instead.
branch will allow others to upload to the same pr, but uploader:
cannot be used.
none includes both limitations and features of user and branch.
I don't really believe there's good use cases for branch and none,
but i'm implementing them to be complete.
Fixes: #11