CODEWITHSUNDEEP
mercurialtortoisehg
PostMan
PostMan

Reputation: 6967

Mercurial Merging only certain changesets

Ok, so we recently converted from SVN to Mercurial.
We are using TortoiseHG normally.

In our one repository we have all of our projects, C++ / .NET / ASP. We have about 100 projects, all using common library projects.

So it would be quite difficult task to create multiple repo's for each project.

Now, we have the default branch, and let's say branchA.
I'm working on BranchA and adding my uber changes to it, and I change a common library, let's say an extension method

I want to commit this to branchA and default, how would I go about this?

However, I don't want all my changes from branchA to be merged into default, and I don't want all the other changes from default

Hopefully this is sufficient information!

Upvotes: 12

Views: 8015

Answers (5)

Wim Coenen
Wim Coenen

Reputation: 66703

There is a way to avoid this problem. You can make all your changes on separate feature branches from some baseline revision, typically the tag of the last release or some other stable point S.

That way, your change X will be on its own branch which can be merged with other branches (merges M1 and M2) without introducing unwanted changesets:

-----S--o----o---M1----o---> default
     |          /
     |---------X   feature or bugfix
     |          \
     \--o---o----M2----o-----> BranchA

This only requires normal hg merge operations; no need for patches, Transplant or MQ.

Upvotes: 11

Almad
Almad

Reputation: 5893

What is want is not merge, but cherry-pick. You can use https://www.mercurial-scm.org/wiki/TransplantExtension, but be aware about complications mentioned there.

Upvotes: 3

Lucero
Lucero

Reputation: 60190

Just to keep things a bit updated: there is the graft command which implements cherry-picking in Mercurial.

This command uses Mercurial's merge logic to copy individual changes from other branches without merging branches in the history graph. This is sometimes known as 'backporting' or 'cherry-picking'. By default, graft will copy user, date, and description from the source changesets.

Upvotes: 23

Laurens Holst
Laurens Holst

Reputation: 21026

If you separate the common code into its own repository, you can use subrepos to include it in each project.

By the way, I would recommend to have a separate repository for each project, especially if there are so many.

Upvotes: 5

rlotun
rlotun

Reputation: 8063

You're describing "cherry picking" or doing a "partial merge" which isn't possible with Mercurial currently. You have a few options:

  • Separate your common code into its own repository.
  • Generate a diff of your changes that you made to your common code, and apply that to the default branch.

Upvotes: -1

Related Questions