Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I just switched over from SVN where after a few changes to the trunk I would merge a range of revisions (from my last merge from the trunk to the branhc – HEAD) into a branch. I want to do the same with Mercurial using TortoiseHG but I can’t figure out how. I just committed two changesets to the trunk, now I need the branch to integrate those changes. Thanks in advance!
In hg (or any DVCS) you can merge any changeset with any other changeset (except ancestors). If you open repository log from TortoiseHG (View Changelog from Explorer context menu or
hgtk logfrom command line), you can update to any changeset, then select “merge with”.In your specific case you would update to your branch head, then merge with trunk head.