I had to repair a flawed Subversion repository recently (not all files were committed). I had my local repository checked out. This was the flawed part, containing only parts of the folders and files it should.
Then, I got a zip file from the machine where it was working. Problem: It contained .svn folders from the other developer. So to merge these i did the following workflow:
- Delete all .svn folders from other developer’s zip
- Move other developers folder over on top of my local install.
- Commit all missing files
Of course this will only work if there are no .svn folders in other developer’s file, because then svn authentication, paths, etc. will be messed up, and commit will fail.
Just save this file as “delete_svn_subfolders.reg”. When you run it, then you will have the new windows explorer context menu item shown in the image.
Windows Registry Editor Version 5.00 ; ; Running this file will give you an extra context menu item in Windows Explorer ; "Delete SVN folders" ; ; For the selected folder, it will remove all subfolders named ".svn" and their content ; Tip from http://www.iamatechie.com/remove-all-svn-folders-in-windows-xp-vista/ ; ; Enrichened with comments by Jesper Rønn-Jensen ( http://justaddwater.dk/ ) ; ; [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Folder\shell\DeleteSVN] @="Delete SVN Folders" [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Folder\shell\DeleteSVN\command] @="cmd.exe /c \"TITLE Removing SVN Folders in %1 && FOR /r \"%1\" %%f IN (.svn) DO RD /s /q \"%%f\" \""