backout

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

What is the difference between hg revert and hg backout?

混江龙づ霸主 提交于 2019-12-03 09:52:18
Both hg revert and hg backout revert changes made by a former revision. What is the difference between the two? 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