how to these changes from server in my case?

[James <ol...@yahoo.com>]

  I did the following on my workspace:   
   - made some changes in a folder called "src" from my working copy;
   - renamed the "src" folder which contains the changes to "src-mine";
   - updated the working copy and get that renamed folder, "src", from server again; now I have "src" and "src-mine" two folders;
   - made some different changes in the folder "src" from above #3;
   - checked in the changes from above #4;
   - deleted "src" folder and rename the "src-mine" back to "src";
   - now the "src" should be different from the "src" on the repository; The local "src" has some changes the repository doesn't have; and the repository "src" has some changes the local src doesn't have;
   - did update and try to get the changes from #4 but Tortoise failed to grape the changes from server;
   - tried command line update command, the same , nothing being updated from server; but we do have changes on the server;
how can I get these changes from server and merge them into my existing changed files?
Thanks,James