File in repo but wont chech out

Hello all,

I'm not subscribed to this list so please cc me.

I'm not 100% sure what's happening or how to fix it, first a brief description.
If I query the server directly, the file exists in the repo, but its not on disk, I cannot check it out, or add it.

$ svn ls svn://marajade/counties2/8.0/htdocs/img/phelpsmo/Courthouse.jpg
Courthouse.jpg

The courthouse.jpg does not exist though, I can't seem to check it out or revert it. svn st shows:

$ svn st -uv
               1394 1261 andy GISLogo.gif
               1394 1393 andy doorhanger.jpg
               1394 1261 andy GISLogo2.png
               1394 953 andy PCATransparent.png
               1394 751 andy SignExample.jpg
               1394 1394 andy .
Status against revision: 1394

If I copy the file in, then the status shows:

$ svn st -uv
               1394 1261 andy GISLogo.gif
               1394 1393 andy doorhanger.jpg
               1394 1261 andy GISLogo2.png
               1394 953 andy PCATransparent.png
               1394 751 andy SignExample.jpg
? Courthouse.jpg
               1394 1394 andy .
Status against revision: 1394

So we add it:

$ svn add Courthouse.jpg
A (bin) Courthouse.jpg
$ svn st
A Courthouse.jpg
$ svn commit -m ''
Adding (bin) Courthouse.jpg
Transmitting file data .svn: E160020: Commit failed (details follow):
svn: E160020: File already exists: filesystem '2d5ec2cd-1e3a-409e-9b6c-2b0857161d4a', transaction '1394-12r', path '/8.0/htdocs/img/phelpsmo/Courthouse.jpg'

I've tried svn cleanup, revert, blowing away the phelpsmo folder and 'svn up'.

The Long Story:
I was running 1.8.10 on the server, and 1.8.8 on the client. I have folders 7.0 and 8.0 and did a merge from 7 to 8. Things happened. It was a little messy. Things where said. Nobody's to blame. I got things resolved and checked in.

I was cleaning out old files "svn rm" and what not when I ran across this. I updated both client and server to 1.8.14, ran cleanup, update, etc, etc. I'm not sure what to do now.

Any help would be appreciated.

Thanks

-Andy
Received on 2015-09-09 16:24:39 CEST