Svn. Rolling back server changes

It happens to be a little shit - then you regret it. Here is a pill for rolling back changes to the server:



svn diff -r 73:68 http://my.repository.com/my/project/trunk



73 is our current revision

68 - where we want to roll back

')

Whether we look really only we made changes a file. If not, then it will have to be rolled back manually - through editing problem areas with a subsequent commit. If everything is ok:



svn merge --dry-run -r 73:68 http://my.repository.com/my/project/trunk/



We look at what will happen if there are no conflicts, we go further:



svn merge -r 73:68 http://my.repository.com/my/project/trunk/



svn merge looks at changes between revision 73 and 68 and applies them to your working copy



svn commit -m "Reverted to revision 68."



Fluffy you bugs, gentlemen!