Fixing a directory conflict in subversion

I have a working copy that I cannot check in due to a conflict. How do I update to the latest revision but yet keep my lo开发者_运维百科cal changes to the files in the server directory?

i.e. here is what I have on my system

bob@blaze:~/dev/store$ ls -l
total 24
drwxr-xr-x 5 bob bob 4096 2010-09-23 00:17 Library
drwxr-xr-x 2 bob bob 2010-09-30 12:22 linclient
drwxr-xr-x 3 bob bob 4096 2010-09-30 12:15 server
drwxr-xr-x 3 bob bob 4096 2010-09-29 15:19 test_client
drwxr-xr-x 3 bob bob 4096 2010-09-30 10:11 test_scripts

Now, there should be a directory called client, I actually moved it under windows to test_client so it's all up to date. But for some reason I can't get client to update to the real client. The error I'm getting is this:

bob@blaze:~/dev/store$ svn commit
svn: Commit failed (details follow):
svn: Aborting commit: '/home/bob/dev/store/client' remains in conflict

Subversion is great, until it breaks. There is no conflict as such, it's just that the .svn folder contains a file that indicates a conflict. How do I fix it so I can update and get the client directory to be downloaded to my working copy as well?

---

I believe you should be able to run

svn resolve --accept=working /home/bob/dev/store/client

---

To accept working copy :

svn resolve --accept=working /home/bob/dev/store/client

or to reject working copy :

svn revert /home/bob/dev/store/client