how to svn update when I have svn deleted local files?
Using svn I have a branch checked out. In my local copy I deleted some files with svn delete.
In the meantime, some other files were modified and checked in to the repository. I want to update my local copy with those changes. I normally do this with svn update and the result has always been, that the files I changed stay the same, while the files others have changed in the meantime, are updated.
I expect the same would happen if I delete files that nobody else touched - they stay deleted, while other files update.
But I get:
svn update(...)
svn: Can't open file (...) No such file or directoryand svn exits immediately with failure status.
1 Answer
I've seen a similar issue to this before and I think it is to do with the file you deleted having changes that needed to be applied before your delete could happen.
The SVN client should be smarter and just ignore the changes, but apparently it isn't.
To fix it I had to:
- Restore the relevant file(s)
- Perform the update
- Deal with conflicts, if any
- Re-delete the file
- Update/commit