How can I remove some commits in Mercurial that were applied to the wrong branch and then replay them on the correct one?

流过昼夜 提交于 2019-12-03 11:03:59

The Mercurial Queues (mq) extension can help.

Given a change history that looks like this:

@  changeset:   3:9dc681b56325
|  summary:     file4
|
o  changeset:   2:6675b3f86aa7
|  summary:     file3
|
| o  changeset:   1:4a3209ed5b2f
|/   summary:     file2
|
o  changeset:   0:6ab45ac3bd6d
   summary:     file1

The following commands moves file 'file4' changeset onto the other branch (the 'file2' head):

hg qimport -r 3     // convert revision 3 to a patch
hg qpop             // remove it
hg update 1         // switch to the other branch head
hg qpush            // push the change back
hg qfin -a          // convert the applied patch back to a changeset

Resulting in:

@  changeset:   3:3faa754edb0b
|  summary:     file4
|
| o  changeset:   2:6675b3f86aa7
| |  summary:     file3
| |
o |  changeset:   1:4a3209ed5b2f
|/   summary:     file2
|
o  changeset:   0:6ab45ac3bd6d
   summary:     file1

Note that the changeset hash for rev 3 changed, due to the changeset having a different parent now. Later versions of TortoiseHg support the MQ extension as well.

From what I have found out, transplant is the best extension to use. It applies a changset to any other revision you want it to.

http://mercurial.aragost.com/kick-start/tasks.html#transplanting-changes

The solution to my problem was to update to the branch where the two changes should have been applied, transplant the two changesets in and then use mq to strip the changes. All do-able within tortoisehg too.

user133536

In this case it is much better to use hg rebase.

https://www.mercurial-scm.org/wiki/RebaseExtension

易学教程内所有资源均来自网络或用户发布的内容,如有违反法律规定的内容欢迎反馈
该文章没有解决你所遇到的问题?点击提问,说说你的问题,让更多的人一起探讨吧!