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

[cherry-picker] [idea 💡] Extend backport sources #13

Open
webknjaz opened this issue Jun 22, 2018 · 5 comments
Open

[cherry-picker] [idea 💡] Extend backport sources #13

webknjaz opened this issue Jun 22, 2018 · 5 comments

Comments

@webknjaz
Copy link
Contributor

I think with https://help.github.com/articles/checking-out-pull-requests-locally/ and https://gist.github.com/piscisaureus/3342247#gistcomment-1566295 cherry-picker could do better and even backport rebase merges and normal merge commits.

@webknjaz webknjaz changed the title [cherry-picker] [idea 💡] Extend backport sources [cherry-picker] [idea 💡 ] Extend backport sources Jun 22, 2018
@webknjaz webknjaz changed the title [cherry-picker] [idea 💡 ] Extend backport sources [cherry-picker] [idea 💡] Extend backport sources Jun 22, 2018
@webknjaz
Copy link
Contributor Author

@Mariatta please transfer this issue to a new repo.

@Mariatta Mariatta transferred this issue from python/core-workflow Jun 22, 2019
@samdoran
Copy link

samdoran commented Aug 5, 2021

Not sure if this is related, but I would really love the ability to backport merge requests or a range of commits. Either pass cherry_picker a merge commit SHA and have it do the right thing (-m 1 maybe?), or have it accept a range like git cherry-pick does with [SHA]..[SHA].

@samdoran
Copy link

samdoran commented Aug 5, 2021

Actually, it looks like ranges work (I was just getting hit by a merge conflict and the --continue didn't to the right thing after resolving). It would still be handy to be able to pass in a merge commit, though.

@webknjaz
Copy link
Contributor Author

webknjaz commented Aug 5, 2021

I think it wouldn't be hard to detect whether some commit is a merge. OTOH it could be harder to figure out whether to pass -m1 or -m2 (though could probably be done by inspecting the parents and checking if it belongs to the default branch).

@samdoran
Copy link

samdoran commented Aug 5, 2021

Right. I wasn't sure about the value for -m. That would take a bit more work and I don't really know how complicated that could get.

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