I want svn update to overwrite my local file with the files from the server, even if my local files have modifications, I want to throw them away and use the version that\'s on
You should use SVN revert. This would revert the files in your working copy to their original state. For more information and examples check the svn book here: http://svnbook.red-bean.com/en/1.1/re25.html
I just wanted to add a little to what diyism posted.
I didn't see the .
next to the ;
in the line
svn revert -R .; svn up
and it confused me. I don't know why you need to explicitly use .
for all files when using revert and you don't using update but that seems to be the way it is.
So, in case it helps anyone, I thought it would be more clear to see the answer as two lines
svn revert -R .
svn update
Worst case, delete the contents of your working copy (excluding the .svn folder) and do an update.
Use this line:
svn revert -R .;svn up
I have this problem occasionally on OSX (10.6, currently using svn 1.6.16). A workaround is to do this:
svn update `svn ls -R`
It can be slow though.
Ref: http://code.google.com/p/support/issues/detail?id=3192
use svn revert