Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

How to catch-up named mercurial branch from default branch without merging the two into one?

I have two branches in mercurial..

default    named
|r1
|r2
|r3 --------         named branch created here.
|            |r4
|            |r5
| r6         |
|            |r7
|            |
-----------> | r8    How do I achieve this catch-up?
|            |

I want to update the named branch from default, but I'm not ready to merge the branches yet. How do I achieve this?

Edit:

Additionally, what would the operation be using the GUI? Is it.. right-click r6, merge with..., r8,... then what? commit to named branch?

like image 518
Dynite Avatar asked Jun 18 '10 09:06

Dynite


People also ask

What is mercurial default branch?

Named branches If no branch name was set, Mercurial assigns the branch name "default". So the name of the default branch in a repository is "default" (which, for example, is not displayed when doing a hg log). Mercurial branch names may be used for whatever reasons users want.

How do you merge in mercurial?

To merge two branches, you pull their heads into the same repository, update to one of them and merge the other, and then commit the result once you're happy with the merge.


1 Answers

hg merge default from your named branch.

like image 57
tonfa Avatar answered Oct 11 '22 13:10

tonfa