Jump to content
Sign in to follow this  
tucny

Cherry pick a whole branch?

Recommended Posts

I have this scenario:

  • quite an old reference changeset (like 100 revisions back, even a lot more), representing a version used by the customer
  • several branches with new features and fixes, newer that the reference changeset
  • request for a patch release, which would include a few of the fixes and new features

Obviously, I'd start a new branch for the patch release from the reference changeset. However, the issue is how to merge the selected fixes and features? Cherry picking individual changesets is not an option — I'd have to do this over like 20–30 changeset. On the other hand, the fixes and features are located in like 3 branches. 

What I'd like to be able to do, is cherry pick a whole branch, i.e. all changes done in a particular branch. This way, in my situation I'd cherry pick three times instead of thirty. Quite a big difference.

From my perspective, the atomic changeset concept, while otherwise logical, is quite failing to support real-world scenarios like this case.

Share this post


Link to post
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.

Guest
Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

Loading...
Sign in to follow this  

×
×
  • Create New...