On 9/10/2015 9:45 AM, Philip Martin wrote:
Philip Martin <philip.mar...@wandisco.com> writes:
Andy Colson <a...@squeakycode.net> writes:
$ svn co svn://marajade/counties2/8.0/htdocs/img/phelpsmo
A phelpsmo/GISLogo2.png
A phelpsmo/PCATransparent.png
A phelpsmo/SignExample.jpg
A phelpsmo/Courthouse.jpg
A phelpsmo/Phelps.gif
A phelpsmo/hsbillw.jpg
A phelpsmo/GISLogo.gif
A phelpsmo/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':
A phelpsmo/Courthouse.jpg
A phelpsmo/Phelps.gif
A phelpsmo/hsbillw.jpg
A phelpsmo/GISLogo.gif
A phelpsmo/doorhanger.jpg
A phelpsmo/GISLogo2.png
A phelpsmo/PCATransparent.png
A phelpsmo/SignExample.jpg
Updated to revision 1394.
Awesome, thank you much!
-Andy
