about hg merge
xiaofeng.ling at intel.com
Mon Aug 29 23:15:28 CDT 2005
Currently, mercurial use hg co -m to do merge.
I often meet such a requirement that when I have a branch with several changeset,
and then I hope to merge to the latest revision, but I hope to still keep the separate
changesets of my branch.
for example, after pull, I have a tree with two head
I hope to get a new tree
here 8,9,10 is 5,6,7's new changeset based on the new revision.
currently, I can do with hg export and hg import one by one for these changeset.
But can I get such a command like
hg merge 5-7
to do it more conveniently?
further, It will be more helpful if I can do like merge 5 and 6 to changeset 8, 7 to 9
by command hg merge
hg merge -m 5,6 7
Open Source Technology Center
Intel China Software Development Center
xfling at users.sourceforge.net
More information about the Mercurial