Geek Answers Handbook

Using Mercurial, how do I get changes from default to a named branch?

I have a central Mercurial repository containing a history cloned from an SVN repository using hgsubversion. I pulled extra commits made in the SVN repository since the original hg repo was cloned; they are currently in the default branch.

I also have a named branch. I cloned this branch (using hg clone -b mybranch) to my local system. Now I want to capture changes that exist only by default and make them available in my named branch. The obvious way that I see is to do it hg update mybranchon the repo, then hg merge defaultcommit. This seems dangerous - if I forget to return to default after everything is over, all future traction from SVN will pull changes to mybranch.

I also thought that maybe I should not have indicated mybranch when I cloned the repo, but cloned the entire repo and just updated to mybranch locally. That way, I could make default changes to my local clone and merge there.

What is the correct answer here? Do it on a common repo and be careful? Clone everything and manage branches locally? Or is there an easier solution that I am missing?

+5
source share
2 answers

In general, with Mercurial, anytime I do something that I think might cause problems, I clone the repo and try it there. Then I can either choose to insert these changes or perform an action in a real repository. In any case, I have the opportunity to fail and not cause any damage. Clones can be thrown away , you do not need to support them if you screw up.

+6
source

. , , .

+1

More articles:


All Articles