Geek Answers Handbook

Mercurial Is it possible to combine changes from the trunk to the branch within the same repo?

Mercurial - is it possible to merge changes from trunk to branch in the same repository?

If so, is this possible with TortoiseHg?

+5
source share
2 answers

There are two things you can do, combine or transplant. These answers suggest a command line; you may have to search through the menus in the turtle to find similar functionality.

You can merge all changes from one branch to another. The procedure for this:

hg update mybranch
hg merge default
hg commit -m "Merging with default"

, , . ,

hg update default
hg merge mybranch
hg commit -m "Bringing in changes from mybranch"

, , "", .

# reqiured in ~/.hgrc
[extensions]
transplant =

, :

hg log | less
# (find revision number, the part after the colon, i.e. "88660cca467d")
hg update mybranch
hg transplant 88660cca467d
# (no commit required)
+5

@Jerub, , . TortoiseHg , " ", , . " ...", .

+2

More articles:


All Articles