I'm working on a client's site. We had the
sites folder as the root of a SVN repository. At some point we ran drush to do module/core updates but Drush was (mistakenly) set to ignore the repository.
Now we have a lot of folders (mostly modules) that have the tilde SVN status. For example, here's five actual folders:
~ all/modules/webform ~ all/modules/password_policy ~ all/modules/views ~ all/modules/services ~ all/modules/pathauto
We've spent time reading about how one addresses the tilde status in a general sense. There's a Stack Overflow question on it. It's pretty clear that Drush deleted these folders that had
.svn folders in them and replaced them with new ones. These new untracked folders have the same name, so the parent folder's
.svn index is confused. In essence, we can't run update because there's something already there taking up the name we need.
What's the best practice?
- Delete the untracked folders, run
svn update, try to use Drush to update again with proper configuration. Edit: Since there are hundreds of nested folders, a bash script would be nice.
- Somehow force a commit of these new files? If that's possible, how to do it? (Note: in this sort of overwhelming situation we would be okay with the revisions on those modules breaking as long as we can commit again)
Note: This is more of an SVN question than a Drupal question, but it's a direct effect of Drush. I assumed Drush-savvy users have bumped into this sort of thing before. Also, I want to know how I can solve the issues without making my client's site crumble.