Philip Martin <philip.mar...@wandisco.com> writes: >> I hate to confess to such absent mindedness, but I may have "svn delete"ed >> this file. I see that I don't have a local copy of it, which supports that >> theory. If I did that, I didn't commit the change -- the repository still >> has the file. > > I'll have to think about that.
This does explain some things. The client is not adding or modifying the file due to any change sent from server, it is merely restoring the missing file from its own metadata. That's a small step forward in understanding the problem. It's still not clear how the upgrade went wrong. It's not as simple as "svn rm file", "svn upgrade", "svn update" as that works (and would have created an op_depth>0 nodes row that we didn't see in the very first query you ran). Perhaps it's something to do with the moved file? Perhaps you did something like: svn rm file-before-mv # or perhaps a mv? # some other wc moves and commits the file svn update # getting a delete/delete tree conflict svn resolved # or revert? rm file-after-mv # a non-svn rm svn upgrade Perhaps you had two files with the same checksum (that's legitimate) and that caused the upgrade to fail? I'll experiment and see if I can reproduce it. -- Philip