Svn. Rollback of changes on the server
Sometimes you get poop - then you regret it. Here is a pill for rolling back changes on the server:
svn diff -r 73:68 http://my.repository.com/my/project/trunk
73 - our current revision
68 - where we want to roll back
We look really only we made changes to the file. If not, you will have to roll 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'll see what will happen if there are no conflicts go ahead:
svn merge -r 73: 68 http://my.repository.com/my/project/trunk/
svn merge looks at changes between revisions 73 and 68 and applies them to your working copy
svn commit -m "Reverted to revision 68."
Fluffy bugs to you, gentlemen!
svn diff -r 73:68 http://my.repository.com/my/project/trunk
73 - our current revision
68 - where we want to roll back
We look really only we made changes to the file. If not, you will have to roll 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'll see what will happen if there are no conflicts go ahead:
svn merge -r 73: 68 http://my.repository.com/my/project/trunk/
svn merge looks at changes between revisions 73 and 68 and applies them to your working copy
svn commit -m "Reverted to revision 68."
Fluffy bugs to you, gentlemen!