Changes in Mercurial / TortoiseHG trunk to branch

Question

I just switched from SVN, where after a few changes in the trunk, I would merge a number of changes (from my last merge from the trunk to branhc - HEAD) into a branch. I want to do the same with Mercurial using TortoiseHG, but I cannot figure out how to do this. I just made two sets of changes in the trunk, now I need a branch to integrate these changes. Thanks in advance!

Answer 1

In hg (or any DVCS) you can combine any set of changes with any other set of changes (except for the ancestors). If you open the repository log from TortoiseHG (View Changelog from the Explorer context menu or hgtk logfrom the command line), you can update it to any set of changes, then select "merge with".

In your particular case, you are updated to the head of your branch, and then merge with the head of the trunk.

Answer 2

I wrote a guide to

When mybranchexecuted, you close it and concatenate by default:

$ hg commit --close-branch -m 'Ready for merge'
$ hg update default
$ hg merge mybranch
$ hg commit -m 'Integrated mybranch'

Mercurial , , . Subversion , , , ( , , ).

Answer 3

This is what I usually do:

hg up trunk #assuming trunk is your main branch
hg merge -r myawesomebranch
#party