> Is this a working copy that you checked-out with the old 1.6 Tortoise > and upgraded to 1.7, or is it a working copy that you checked-out with > 1.7?
This is a 1.6.17 working copy that was upgraded. > A text-conflict or a tree-conflict? Do you have any local modifications > to the working copy? Adds, deletes, copies etc.? Text-conflict to a single file. I had local modifications but resolved the conflict by using the repository's version of the file (the update was a superset of my changes). > Is the sqlite3 utility readily available on Windows? If it is then run: > sqlite3 .svn/wc.db "select * from work_queue" Yep, here's the output: 79|(file-install X/MONSTER.FMX/MONSTER.FMX.csproj 1 0 1 1) 80|(file-install X/MONSTER.FMX/Boxes/gbFMXDisplay.resx 1 0 1 1) 81|(file-install X/MONSTER.FMX/Boxes/gbFMXDisplay.Designer.cs 1 0 1 1) 82|(file-install X/MONSTER.FMX/Boxes/gbFMXDisplay.cs 1 0 1 1) These are files that were new from the repo and were the last to show up before the assertion appeared.
