Cherry pick across forks

Description

Currently if I want to cherry pick a single commit from a fork I'd have to download the .patch-file for it and do it manually. It would be very nice to have a "cherry pick into fork" button for this instead.

Proposal

Links / references

This proposal seems to span the boundary between the ~Discussion team and the ~Platform team

@jramsay Where should this lie?

added ~2278658 forking repository labels

I think it's probably ~Platform.

How do you imagine this working from a workflow perspective @bkc? Would you want to be able to bring over multiple commits from a merge request, or select commits from somewhere else?

Well, preferably like we have today with both a Cherry Pick-button in the MR (for the entire MR), and also (though not as high prio IMO) a Cherry Pick-button in the commit listing. As for how to implement it, git format-patch/git apply-patch should do the job (we have both already), since they source-branch might be gone after it's been merged.

Customer is also interested in such functionality: https://gitlab.zendesk.com/agent/tickets/94353 (internal)

added customer label

Hi guys. At the moment we have multiple teams working on multiple forks. In order to do this we need to move the whole branch over and then cherry-pick. We all agree it would be really nice and it would free up time if we could just cherry-pick the commit itself across.

/cc @DouweM @tiagonbotelho

added backend frontend labels

Hi guys. Is there any movement on a fix for this at all? Some teams in here don't have forks and are pushing to master and it is proving to be extremely messy. Thanks a lot.

added devopscreate label

added to epic &264

added Create [DEPRECATED] and removed ~2278658 labels

mentioned in epic &264

added [deprecated] Accepting merge requests label

mentioned in epic &687 (closed)

added groupsource code label

mentioned in epic &264

changed epic to &1421 (closed)

Hey!

GitLab is moving all development for both GitLab Community Edition and Enterprise Edition into a single codebase. The current gitlab-ce repository will become a read-only mirror, without any proprietary code. All development is moved to the current gitlab-ee repository, which we will rename to just gitlab in the coming weeks. As part of this migration, issues will be moved to the current gitlab-ee project.

If you have any questions about all of this, please ask them in our dedicated FAQ issue.

https://gitlab.com/gitlab-org/gitlab-ee/issues/13855

You can also find more information here:

• https://gitlab.com/gitlab-org/gitlab-ee/issues/13304
• https://about.gitlab.com/2019/08/23/a-single-codebase-for-gitlab-community-and-enterprise-edition/

Frequently Asked Questions

For an up to date list of questions and answers, please take a look at https://gitlab.com/gitlab-org/gitlab-ee/issues/13855

What will we do with the repository names?

https://gitlab.com/gitlab-org/gitlab-ee/ will become https://gitlab.com/gitlab-org/gitlab, and https://gitlab.com/gitlab-org/gitlab-ce will become https://gitlab.com/gitlab-org/gitlab-foss.

Why rename gitlab-ce to gitlab-foss?

Using "gitlab" and "gitlab-ce" would be confusing, so we decided to rename gitlab-ce to gitlab-foss to make the purpose of this FOSS repository more clear

I created a merge requests for CE, and this got closed. What do I need to do?

You will need to create a merge request at https://gitlab.com/gitlab-org/gitlab-ee/. This link will eventually redirect to https://gitlab.com/gitlab-org/gitlab.

How does the licensing work in this new setup?

Everything in the ee/ directory is proprietary. Everything else is free and open source software. If your merge request does not change anything in the ee/ directory, the process of contributing changes is the same as when using the gitlab-ce repository.

Will you accept merge requests on the gitlab-ce/gitlab-foss project after it has been renamed?

No. Merge requests submitted to this project will be closed automatically.

Will I still be able to view old issues and merge requests in gitlab-ce/gitlab-foss?

Yes.

How will this affect users of GitLab CE using Omnibus?

No changes will be necessary, as the packages built remain the same.

How will this affect users of GitLab CE that build from source?

Once the project has been renamed, you will need to change your Git remotes to use this new URL. GitLab will take care of redirecting Git operations so there is no hard deadline, but we recommend doing this as soon as the projects have been renamed.

Where can I see a timeline of the remaining steps?

https://gitlab.com/gitlab-org/gitlab-ee/issues/13304

Will community contributions submitted to the new "gitlab" repository be available in the new gitlab-foss repository?

Yes, these changes will be synced to gitlab-foss automatically, several times per day.

locked this issue