Want to go back 3 revisions like?
Let's say I have a custom object, I deleted a property and all things in the web project that used that property (admin pages that updated the property, data layer, etc., etc.).
Now I was told that we need this property, looking at the Subversions log it seems like the correct code is 3 revisions.
How can I go back and then somehow get any updates other devleopers might have happened as well?
source to share
Get the version number from the log for the correct code. Right click on the file you want to rollback. Select Tortoise SVN → Upgrade to Version . In the dialog box, enter the revision number, for which you need to update the file, click "OK" and you're done!
EDIT: - for command line action use svn merge
. for more information, enter the following command at a command prompt:
svn --help merge ENTER
Here is a link to an SVN book describing the operation.
You can also look at this question , which also addresses the same issue.
If you've committed all the changes and only one change has changed, you can undo that change in your working copy. Then you can commit this if it works.
Log messages> right click the offending revision> Revert changes from this version
I've only tried this for a small number of files, I guess there might be some serious conflict headaches.
source to share
In theory, you can collapse the merge. I tried it once and subversion absolutely failed to do it - my working copy got corrupted or just flat crashed every time.
In practice, you may need to upgrade to an older version, save copies of affected files, upgrade to the latest version, manually roll back the merge of changes.
It would be much more practical (albeit unsophisticated) if you can just update 3 turns back, confirm it, and make changes since they confirm them.
source to share