I work with a shared SVN. Occasionally, there's a problem with the latest HEAD build, and I need to rollback to a previous version that works while it's being fixed.
I do this by going into the SVN logs, right-click on the revision and select "Revert to this revision", as described here: http://tortoisesvn.net/docs/nightly/TortoiseSVN_en/tsvn-howto-rollback.html
When the problem is fixed, how do I go back to the HEAD version (i.e. undo the rollback)? Updating does nothing. The only ways I have are a) deleting all my files and doing a fresh checkout, or b) going to the commit dialog and individually reverting my files (which brings them up to the HEAD version).
This seems pretty awkward and broken, so is there a better way of doing this?
Sounds like what you actually want to do is "Update to revision...", not actually a revert operation. If you know the HEAD (or revision X) is broken, right-click and use "Update to revision..." to update to the latest working revision number. When you're ready to update back to HEAD again just do a normal update. Think that should work anyway!
Edit: Note that I've not actually tried this, but sounds workable to me.
Related
I have a nodjs project and i use IntelliJ to run it. Lately the project structure is not appearing as it used to, as if the project was not compiling. So, while searching for answeres, I clicked on the "Update project" button on the right top, but quickly realised it was going to update based on what was on the remote repo.
I've been developing for a few weeks without a single commit because my company asked me to (don't ask why), and the code had sensible data so I didn't have a backup.
After clicking that button, IntelliJ asked me if I wanted to merge my project files with the remote ones, I just pressed Cancel, and that was enough for IntelliJ to merge my entire project and lose a bunch of files I've been working with.
Suprisingly, they're not even on the Local History list. Even though it says "279 files" there I can't click or find any of the files.
Despite not being able to find them, I went to the changes.storageData file under IntelliJIdea2017.2\system\LocalHistory, searched for the names of the files I'm looking for, and found them all there, which makes me think there's still a way of finding them.
So, does anyone know where I can find deleted files after pressing the git "Update project" button on IntelliJ when they're not on the Local History file list?
Thanks a lot in advance!
As I understand, the files were not committed, so Update could not delete them, because git merge/rebase do not start when there are uncommitted changes (see e.g. this question)
They were probably automatically stashed before the update, and not unstashed because the update was actually canceled.
So the first place to check is git stash VCS - Git - Unstash... or Shelf (if Update project is configured to use Shelf)
I had some changes on my local file but by mistake I took latest version from TFS. Now my changes have been lost. What can I do to take my unchange copy back? Please suggest.
Nothing. If you didn't commit your changes, they're gone.
Unless you added your previous changes to a shelveset (which is unlikely, otherwise you'd know they're there), your changes are gone.
Further reading, in case you don't know what a shelveset is:
What is shelving?
What is the purpose of a shelveset?
Though Daniel's answer is perfect one for the question, I want to share something with others who might face the same situation as mine. As I got latest version from TFS, new files were giving giving compilation errors hence there was change in source files but not in dlls. After surfing around I have found ILSpy link which helped to to recover my source code.
I am not sure why but sometimes my SVN project seems like it is not synced to SVN: the exclamations (!) on the folders go away and now i can't tell which folders I have made changes to.
I can still commit my files, but it makes it difficult to keep up with the changes I have made on the files. The files seem like they aren't even added to the project as if I copied/pasted them in there but haven't added/committed them yet.
Has anyone had the same problem?
Yes I have that problem all the time. I don't think there is a solution for it. Sometimes if I refresh the folder it updates it to green check mark but this is something tortoise needs to work on. I definitely feel your pain.
After restarting my computer, the icons showed up again..originally i restarted and it did not work, but after a while i restarted again and this time the icons came back.
I made some changes to my ASP.NET MVC 4 project that introduced a bug, so I wanted to rollback my project to the last check-in. This check-in works; it doesn't have any broken code. So I used the "Get Specific Version" option, navigated to my last check-in, and rolled it back.
It doesn't revert my code to my last check-in's code. It just puts a little red check mark next to all of the files that contain my broken code with a tooltip saying "Checked out to me".
So I decided to rollback to my very first check-in. Some conflicts auto-resolve; I keep all of the server's versions of files when it prompts me to. It doesn't revert my code to my very first check-in's code. What am I missing; how do I load the code from my last successful check-in?
I ended up figuring out how to fix this myself: after navigating to View > Team Explorer, I had eight Pending Changes that were hidden. Manually right-clicking these and selecting "Undo" reverted the files to the last successful check-in. Pretty basic stuff, but I figured I would post an answer rather than deleting my question entirely, because the process is a little confusing for a beginner (like myself).
The last TortoiseSVN Update command loaded work-in-progress code from the trunk which shouldn't have been committed yet, and overwrote the files that I had on my branch.
How do I undo that last Update command and revert back to the versions that I had on my machine before the Update?
There is no "undo" or "revert", but if you update to the previous revision, that is the recommended way to accomplish what you are asking for. In TortoiseSVN, select "Update to revision..." and enter the revision number you want to go back to.
revert back to the versions that I had on my machine
If you had local changes on your machine that were never committed (i.e., no revision number), and you updated over them, then you are out of luck. The only way to get back your local changes is if you have a backup (check the "Previous Versions" tab in Windows Explorer...)
Check out this guide for undoing revisions on TortoiseSVN. The entire concept of version control supports the issue you've created for yourself so it is a popular action.
This is called update to revision... In the ui you can choose which version you want to go back to. Make backup copy of your local svn tree first to be safe!
You can update to a specific revision by right clicking on your working copy, Under the TortoiseSVN menu item, there is a update to revision menu option that will allow you to change your working copy to the revision of your choice. If you do a show log on the repository you can get an idea of when the offending code got committed and revert back to the prior repository revision. As a precaution, I would make a copy of and working copy, or important files in your working copy, to ensure that if things go bad, you can always get back to where you are now.
Now this changes your working copy, not the repo, so if you are wanting to revert the repository back, then that is a different issue, but I do not think that is what you are asking for.