What is the difference between hg revert and hg backout?

你离开我真会死。 提交于 2019-12-21 03:18:11

问题


Both hg revert and hg backout revert changes made by a former revision. What is the difference between the two?


回答1:


Given the history of changesets:

A --- B --- C --- D --- E
          [bad]        (*)

hg revert -r B: Stay at current revision, but update the working directory as of revision B. It has the effect of a patch that revokes the changes of C, D and E.

hg backout -r C: Update the working directory so that it contains the merge of revision C's parent (B) and the current revision, preserving the changes made in between the two revisions (working dir still contains changes of revision D and E). This has the effect of a patch applied on E, undoing the changes of only C.

You may want to edit some files if not all of C was bad. Remember to do a hg commit in any case:

A --- B --- C --- D --- E --- F
          [bad]              (*)


来源:https://stackoverflow.com/questions/13763034/what-is-the-difference-between-hg-revert-and-hg-backout

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