Update the working copy - again...

Quite new to Subversion, so this is baffling me:
Error: Commit failed (details follow):
Error: Out of date: '/trunk/www/controller/Search.php' in transaction '2f'
Error: You have to update your working copy first.

I can see various posts similar to this, but can't figure out how to apply
what is said there, to my problem.

Currently, the version of Search.php on the site is twice the size - it
contains two versions. I have figured out what it should be, and have tried
to upload it from my local hard disk to Subversion, and got the above error.
I have also tried REVERTing, then uploading.

I *think* that when the above message says "update your working copy", it is
talking about the copy which I would edit, on my local hard disk, but I am
not clear.

I am on a Windows machine, the site is on Unix, there are no other
programmers, I have not Merged anything, and I can FTP to the file on the
site (I can't find what Subversion calls the files on the site).

Please can someone help...?

-- 
View this message in context: http://www.nabble.com/Update-the-working-copy---again...-tp14277792p14277792.html
Sent from the Subversion Users mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org