revert

[master] ... 0 - (1) - (m1) - 2 - (3) - 4 \ [develop] 5 - 6 - 7 说明： 带括号的都是错误的commit，m1是merge提交，每个数字代表commit和commit号 需要放到develop分支 我的做法（目前看来没问题，不确定是否正确）： git checkout master git pull git diff 0 1 > patch1 （这两步的主要想法是物理备份一下，万一改乱了，还有个修改记录） git diff 2 3 > patch2 git revert m1 -m 2 （这样直接会将1 和 m1产生修改的所有文件反转） git revert 3 此时，分支状态是： [master] ... 0 - (1) - (m1) - 2 - (3) - 4 - rm1 - r3 \ [develop] 5 - 6 - 7 然后将错误提交应用到develop上 git checkout develop git pull git cherry-pick 1 git cherry pick 3 （进入merge按照提示解决、继续） 此时分支状态是： [master] ... 0 - (1) - (m1) - 2 - (3) - 4 - rm1 - r3 \ [develop] 5 - 1 - 6 - 7 - 3

This question might seem stupid, but I cannot find any instruction on how to roll back an evolution in Play 2.0. Google only finds pages which say that the "Downs" section of an evolution file is used for that and that's all. Any pointers or instructions will be appreciated. The Downs part is mainly used to revert an Evolution when the script has changed. That is, you have a project with 2.sql applied to the database and then, due to a merge, 2.sql is modified in the source. Play will run Downs on the old version and then Ups on the new 2.sql to ensure the database is in sync with the codebase

I want to revert a directory and all sub-directories in an SVN working copy so they match the repository but I don't want to touch any files inside those directories. One of my SVN applications recursively set an SVN property on every directory in my working copy but I want to revert those changes to stop it highlighting them and trying to commit the changes to the SVN properties. Simply changing it to match the HEAD doesn't work. Any ideas? I've read through various SVN resources but none of them seem to deal with this edge case. You could use find combined with svn revert : find . -type d |

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

I have a branch A and a branch B (and some other branches). Lets say A 's commit history looks like: commit 5 commit 4 commit 3 ... And B 's commit history: some other commit commit 4 merge of other stuff from branch C (into branch B ) commit 3 ... Basically what I want is to "delete" all changes made by the commits some other commit and merge of other stuff from branch C to branch B . I want the working tree of branch B to be exactly the same like branch A 's working tree. How do I achieve this? One way to achieve this is through git reset . While on branch B execute git reset --hard A