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
Re: File in repo but wont check out
On 09/09/2015 03:02 PM, Andreas Stieger wrote: Hello, On 09/09/15 16:14, Andy Colson wrote: 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'. Your description is consistent with a partial working copy, e.g. excluded items. Try svn up --set-depth infinity. Andreas Thanks Andreas, but unfortunately that didnt work. I tried at the root of the repo and in the phelpsmo folder. I had added the file (as above) so first I revert it, then removed the file. $ svn revert Courthouse.jpg Reverted 'Courthouse.jpg' $ rm Courthouse.jpg $ 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 $ svn up --set-depth infinity Updating '.': At revision 1394. But its still not here, 'svn st' shows exactly as a above. I will research 'excluded items' and 'partial working copy' however, they are search terms I've not tried yet. Just for a test, I tried checking out to a tmp spot: $ cd /tmp/ $ svn co svn://marajade/counties2/8.0/htdocs/img/phelpsmo Aphelpsmo/GISLogo2.png Aphelpsmo/PCATransparent.png Aphelpsmo/SignExample.jpg Aphelpsmo/Courthouse.jpg Aphelpsmo/Phelps.gif Aphelpsmo/hsbillw.jpg Aphelpsmo/GISLogo.gif Aphelpsmo/doorhanger.jpg U phelpsmo Checked out revision 1394. So that worked. I guess that helps me be sure it is actually in the repo, but I'm not sure what it means. -Andy
Re: File in repo but wont check out
On 9/10/2015 12:30 AM, Andreas Stieger wrote: On 09/09/15 22:54, Andy Colson wrote: On 09/09/2015 03:02 PM, Andreas Stieger wrote: On 09/09/15 16:14, Andy Colson wrote: 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. [...] Your description is consistent with a partial working copy, e.g. excluded items. Try svn up --set-depth infinity. Thanks Andreas, but unfortunately that didnt work. I tried at the root of the repo and in the phelpsmo folder. [...] Just for a test, I tried checking out to a tmp spot: $ cd /tmp/ $ svn co svn://marajade/counties2/8.0/htdocs/img/phelpsmo [...] Aphelpsmo/Courthouse.jpg [...] So that worked. I guess that helps me be sure it is actually in the repo, but I'm not sure what it means. Maybe part of your working copy is switched to a path where the item does not exist. (switched subtree). You can check, svnversion would show an "S". If that is the case, switch the whole working copy to the path you think it's working from: svn switch svn://marajade/counties2/8.0/htdocs/img/phelpsmo Failing that, discard the working copy and try over. Andreas Humm, nope, no S's. I checked it all the way down: andy@mapper:/pub/www/counties/8.0$ svnversion 1394 andy@mapper:/pub/www/counties/8.0$ cd htdocs/img/ andy@mapper:/pub/www/counties/8.0/htdocs/img$ svnversion 1394 andy@mapper:/pub/www/counties/8.0/htdocs/img$ cd phelpsmo/ andy@mapper:/pub/www/counties/8.0/htdocs/img/phelpsmo$ svnversion 1394 > Failing that, discard the working copy and try over. Yeah, a fresh copy sounds like a good fix. I have a bunch of extra files not checked in, but a quick directory diff should find those. Thanks for your help on this. -Andy
Re: File in repo but wont check out
On 9/10/2015 9:45 AM, Philip Martin wrote: Philip Martin writes: Andy Colson writes: $ svn co svn://marajade/counties2/8.0/htdocs/img/phelpsmo Aphelpsmo/GISLogo2.png Aphelpsmo/PCATransparent.png Aphelpsmo/SignExample.jpg Aphelpsmo/Courthouse.jpg Aphelpsmo/Phelps.gif Aphelpsmo/hsbillw.jpg Aphelpsmo/GISLogo.gif Aphelpsmo/doorhanger.jpg U phelpsmo Checked out revision 1394. So that worked. I guess that helps me be sure it is actually in the repo, but I'm not sure what it means. In the broken working copy run sqlite3 .svn/wc.db "select * from nodes where local_relpath like '%Courthouse.jpg'" to see what working copy has for the path. If the above command produces no output then one possibility is that a Subversion bug has caused the working copy to lose track of the path. If that is the case there are various things you could do to repair your working copy. A) If you can afford to lose all the contents of phelpsmo/ then do svn up --set-depth empty phelpsmo svn up --set-depth infinity phelpsmo B) If you can identify the revision in which Courthouse.jpg was added to the repository then updating phelpsmo/ to that revision will attempt to delete the file and will produce an error. The error will leave the phelpsmo/ directory marked 'incomplete' and then a second update to HEAD should restore the missing file. Of course the first update will bring other changes for that revision some of which may be unwelcome. C) Warning: the following could break your working copy. You may be able to fix your working copy by manually marking the directory 'incomplete' sqlite3 .svn/wc.db "update nodes set presence='incomplete' where local_relpath='the/path/to/the/phelpsmo'" where 'the/path/to/the/phelpsmo' is relative to the working copy root. A subseqent update should restore the missing file. Wow, I seem to have a lot of courthouses, had to cut it down a little, but it only seems to see the file in the 7.0 folder (which does exist and I probably tried to merge it from 7.0 to 8.0): .header on; select * from nodes where local_relpath like '%phelpsmo/Courthouse.jpg'; wc_id|local_relpath|op_depth|parent_relpath|repos_id|repos_path|revision|presence|moved_here|moved_to|kind|properties|depth|checksum|symlink_target|changed_revision|changed_date|changed_author|translated_size|last_mod_time|dav_cache|file_external|inherited_props 1|7.0/htdocs/img/phelpsmo/Courthouse.jpg|0|7.0/htdocs/img/phelpsmo|2|7.0/htdocs/img/phelpsmo/Courthouse.jpg|1394|normal|||file|(svn:mime-type image/jpeg)||$sha1$9a54e122d90899578251fc7d9c20b5ba7f4550e7||751|1387566220107100|andy|39946|1385482542319299||| Option A worked! andy@mapper:/pub/www/counties/8.0/htdocs/img$ mv phelpsmo/ bad andy@mapper:/pub/www/counties/8.0/htdocs/img$ svn up --set-depth empty phelpsmo D phelpsmo/GISLogo.gif D phelpsmo/doorhanger.jpg D phelpsmo/GISLogo2.png D phelpsmo/PCATransparent.png D phelpsmo/SignExample.jpg Updating 'phelpsmo': Restored 'phelpsmo' Updated to revision 1394. andy@mapper:/pub/www/counties/8.0/htdocs/img$ svn up --set-depth infinity phelpsmo Updating 'phelpsmo': Aphelpsmo/Courthouse.jpg Aphelpsmo/Phelps.gif Aphelpsmo/hsbillw.jpg Aphelpsmo/GISLogo.gif Aphelpsmo/doorhanger.jpg Aphelpsmo/GISLogo2.png Aphelpsmo/PCATransparent.png Aphelpsmo/SignExample.jpg Updated to revision 1394. Awesome, thank you much! -Andy
