Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

How to repair obstructed directories in working copies

I have an application which keeps its data in a directory tree.

Now, I want to keep this directory under version control with svn.

The problem is, however, that this application from time to time deletes and recreates some directories in this tree, which leads to the appropriate .svn subdirectories to be lost, and TortoiseSVN then loudly complains about obstructed directories.

Is there any special option, script (cygwin batch, windows cmd, python...) or program that can repair those working copies? Currently, I'm using a directory synchronization tool to re-add the lost .svn files from a second working copy, but that is very cumbersome.

Thanks!

like image 620
MarkusSchaber Avatar asked Mar 17 '11 12:03

MarkusSchaber


1 Answers

I renamed the conflicting folder and ran an SVN update to restore the folder from SVN.

After diffing with my favorite diff tool (Synchronize directories in Total Commander), i see that the only difference was that the conflicting folder had an .svn folder in it.

like image 159
Cees Timmerman Avatar answered Nov 15 '22 15:11

Cees Timmerman