Today I tried to load a previous version of my project from subversion (revision #140), only to discover that a bad commit occured in verison #120: attempting to load any version of the project from version 120 onwards results in missing files etc. So, effectively, revisions 120+ are unusable.
However, I still have a fully a-ok uncommitted working copy of what was planned to be revision 141 in visual studio.
I am pretty darn unfamiliar with SVN’s commands and don’t want to stuff it up!
What would be the best strategy to return the repository to a workable state and bring the HEAD version up to date to match my working copy/141?
I’m using AnkhSVN 2.3 in VS2010. The server is not local, but I have access to SVN’s command line.
Thanks!
p.s I assume I will lose revisions 120-140: this is fine so long as committing 141 applies all net changes made in 120-140.
I am not sure what do you mean by bad commit, but you can consider performing a “reverse merge”, which will be rev 141, and you update your working copy and have it as rev 142.
Depends on your SVN client, there are easier way to achieve this. In Tortoise SVN, you can open the log, select rev 119, right click and choose “Revert to this revision”
If you are using command line, check out a separate working copy, go to the working copy, and perform the reverse merge
Consider reading http://svnbook.red-bean.com/ on the chapter about “Undo changes”
updated: I mistyped 119 as 199