Reputation: 2522
I'm working on a multi-developer project using SVN. I had a folder with some images in it.
At some point the images vanished despite there being no commit showing them being deleted (I only just noticed when I came to work on the folder). Looking through the commit log I can see that a colleague added them back in and committed the change about 100 revisions ago, but my working copy still didn't have the images, despite updates, checkouts and switching around various revisions.
I manually added the images - but now I can't commit that folder as SVN fails saying the files already exist. I can commit other changes if I ignore the images folder, but this is going to be a pain to do several times a day for the next few years.
Any ideas how I can convince SVN the images don't need to be added?
Upvotes: 1
Views: 256
Reputation: 97282
svn up
to HEADIf you will not get all missing files, show log here
Upvotes: 0
Reputation: 11920
You could revert the folder containing the images to a prior commit, which will restore the images (and any necessary .svn folders in the path that are required to track the files).
My guess is that the .svn folder in the images folder got deleted as well, so it looks like the folder is new to your working copy, but the server knows better, since it still has the images in its copy.
Upvotes: 2