Rolling back bad changes with svn in Eclipse

Question

Let s say I have committed some bad changes to Subversion repository  Then I commit good changes  that I want to keep   What would be easiest way to roll back those bad changes in Eclipse  and keep the good changes  Assuming that files relating to bad changes are not same as those relating to the good changes  How things change if good changes were made to same files as bad changes   I am mostly looking a way to do this via Eclipse plugins  Subclipse or Subversive  but commandline commands are also interesting

User · Answer

The svnbook has a section on how Subversion allows you to revert the changes from a particular revision without affecting the changes that occured in subsequent revisions:

http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.undo

I don't use Eclipse much, but in TortoiseSVN you can do this from the from the log dialogue; simply right-click on the revision you want to revert and select "Revert changes from this revision".

In the case that the files for which you want to revert "bad changes" had "good changes" in subsequent revisions, then the process is the same. The changes from the "bad" revision will be reverted leaving the changes from "good" revisions untouched, however you might get conflicts.

User · Answer

In Eclipse Ganymede  Subclipse   Select project file that contains bad change  and from pop-up menu choose   Team -  Show History  Revisions related to that project file will be shown in History tab   Find revision where  bad changes  were committed and from pop-up menu choose   Revert Changes from Revision X  This will merge changes in file s  modified within bad revision  with revision prior to bad revision    There are two scenarios from here    If you committed no changes for that file  bad revision is last revision for that file   it will simply remove changes made in bad revision  Those changes are merged to your working copy so you have to  commit them  If you committed some changes for that file  bad revision is not last revision for that file   you will have to manually resolve conflict  Let say that you have file readme txt with  and bad revision number is 33  Also  you ve made another commit for that file in revision 34  After you choose Revert Changes from Revision 33 you will have following in your working copy    readme txt merge-left r33    - bad revision  readme txt merge-right r32   - before bad revision  readme txt working           - working copy version  same as in r34 if you don t have any uncommitted changes   Original readme txt will be marked conflicted  and will contain merged version  where changes from bad revision are removed  with some markers   lt  lt  lt  lt  lt  lt  lt   working etc   If you just want to remove changes from bad revision and keep changes made after that  then all you have to do is remove markers  Otherwise  you can copy contents from one of 3 files mentioned above to original file  Whatever you choose  when you are done  mark conflict resolved by   Team - Mark Resolved  Temporary files will be removed and your file will be marked changed  As in 1  you have to commit changes   Note that this does not remove revision from revision history in svn repository  You simply made new revision where changes from bad revision are removed

User · Answer

I have same problem but CleanUp eclipse option doesn t work for me   1  install TortoiseSVN  2  Go to windows explorer and right click on your project directory 3 Choice CleanUp option  by checking break lock option   It s works   Hope this helps someone

User · Answer

In Eclipse using Subversive   Right click your project   Team   Merge  In the merge window  select the revisions you want to revert as normally but also enable checkbox  Reversed merge    Merge as normally

User · Answer

If you want to do 1 file at a time you can go to the History view for the file assuming you have an Eclipse SVN plugin installed    Team- Show History   In the History view  find the last good version of that file  right click and choose  Get Contents    This will replace your current version with that version s contents   Then you can commit the changes when you ve fixed it all up

User · Answer

You have two choices to do this   The Quick and Dirty is selecting your files  using ctrl  in Project Explorer view  right-click them  choose Replace with    and then you choose the best option for you  from Latest from Repository  or some Branch version  After getting those files you modify them  with a space  or fix something  your call and commit them to create a newer revision    A more clean way is choosing Merge at team menu and navigate through the wizard that will help you to recovery the old version in the actual revision   Both commands have their command-line equivalents  svn revert and svn merge

User · Answer

I have written a couple of blog posts on this subject   One that is Subclipse centric  http   markphip blogspot com 2007 01 how-to-undo-commit-in-subversion html and one that is command-line centric  http   blogs collab net subversion 2007 07 second-chances

[eclipse] Rolling back bad changes with svn in Eclipse

Examples related to eclipse

Examples related to svn

Examples related to subclipse

Examples related to subversive