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.

Sign up for GitHub

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

Jump to bottom

Allow to cherry-pick commit to other branch #3880

Closed
lafriks opened this issue May 1, 2018 · 8 comments · Fixed by #17902
Closed

Allow to cherry-pick commit to other branch #3880

lafriks opened this issue May 1, 2018 · 8 comments · Fixed by #17902
Labels
issue/confirmed Issue has been reviewed and confirmed to be present or accepted to be implemented type/feature Completely new functionality. Can only be merged if feature freeze is not active.
Milestone
1.17.0

Comments

@lafriks
Copy link
Member

lafriks commented May 1, 2018

It would allow to backport commits to other branches more easily from UI. Of course that would work only for commits that does not have conflicts with target branch
@lafriks lafriks added the type/feature Completely new functionality. Can only be merged if feature freeze is not active. label May 1, 2018
@lafriks lafriks added this to the 1.x.x milestone May 1, 2018
@stale
Copy link

stale bot commented Jan 27, 2019

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs during the next 2 weeks. Thank you for your contributions.

@stale stale bot added the issue/stale label Jan 27, 2019
@lafriks lafriks added the issue/confirmed Issue has been reviewed and confirmed to be present or accepted to be implemented label Jan 27, 2019
@stale stale bot removed the issue/stale label Jan 27, 2019
This was referenced Jan 18, 2020
Closed
Closed
@guillep2k
Copy link
Member

I think it would be great. Since this would be automatic, Gitea can not only sign the new PR but also certify that it's an actual cherry-pick of the original PR.

@alexanderadam alexanderadam mentioned this issue Mar 27, 2020
Closed
@jpraet jpraet mentioned this issue Jan 27, 2021
Closed
12 tasks
@nacho-domatix
Copy link

Is there a way to help (financially) to accelerate this? I would be glad to contribute.

@zeripath
Copy link
Contributor

Unfortunately this is is unlikely to make it into 1.16 but feel free to drop me message on discord <@zeripath> or on element <@zeripath:matrix.org>, or post a message on our discord #job channel.

@lunny
Copy link
Member

lunny commented Nov 30, 2021

Or you can use https://www.bountysource.com/teams/gitea/issues?tracker_ids=47456670

@nacho-domatix
Copy link

I tried to contact @zeripath. Bountysource could be the way. I'm not sure how much I should offer tho. Any ideas @lunny?

@lunny
Copy link
Member

lunny commented Dec 2, 2021

Sorry, I don't know. The number of money is not equal to the value of the feature. How much do you want to donate depends on yourself.

@nacho-domatix
Copy link

Well, a donation is one thing and asking someone (a budget) to develop something is another thing. I guess both are welcome in this (and any) opensource project, but I'm trying to find out more about the second option, where money equals the time of the developer (kind of).

@zeripath zeripath mentioned this issue Dec 12, 2021
Merged
zeripath added a commit that referenced this issue Feb 9, 2022
@zeripath
Add apply-patch, basic revert and cherry-pick functionality (#17902)
eb748f5 
This code adds a simple endpoint to apply patches to repositories and
branches on gitea. This is then used along with the conflicting checking
code in #18004 to provide a basic implementation of cherry-pick revert.

Now because the buttons necessary for cherry-pick and revert have 
required us to create a dropdown next to the Browse Source button
I've also implemented Create Branch and Create Tag operations.

Fix #3880 
Fix #17986 

Signed-off-by: Andrew Thornton <art27@cantab.net>
@lunny lunny modified the milestones: 1.x.x, 1.17.0 Feb 12, 2022
Chianina pushed a commit to Chianina/gitea that referenced this issue Mar 28, 2022
@zeripath
Add apply-patch, basic revert and cherry-pick functionality (go-gitea…
f1f5e25 
…#17902)

This code adds a simple endpoint to apply patches to repositories and
branches on gitea. This is then used along with the conflicting checking
code in go-gitea#18004 to provide a basic implementation of cherry-pick revert.

Now because the buttons necessary for cherry-pick and revert have 
required us to create a dropdown next to the Browse Source button
I've also implemented Create Branch and Create Tag operations.

Fix go-gitea#3880 
Fix go-gitea#17986 

Signed-off-by: Andrew Thornton <art27@cantab.net>
@go-gitea go-gitea locked and limited conversation to collaborators Apr 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
issue/confirmed Issue has been reviewed and confirmed to be present or accepted to be implemented type/feature Completely new functionality. Can only be merged if feature freeze is not active.
Projects
None yet
Milestone
1.17.0
Development

Successfully merging a pull request may close this issue.

Add apply-patch, basic revert and cherry-pick functionality zeripath/gitea
5 participants
@lunny @lafriks @zeripath @guillep2k @nacho-domatix