2010/2/23 Jean-François Davignon <j...@ingenius.com>: > Overworked DFU, or should I say DFU because overworked: > - renamed branch Project_30 to Project_31 but Project_31 branch already > existed in that location, ignored errors, dismissed dialogs, forgot about > whole thing; > - did update on parent folder, got errors, deleted Project_31, ran Cleanup > and updated successfully; > - Noticed Project_31 did not come down; > - Checked Project_31 out but then there was message about tree conflict; > - Selected Commit on Project_31 to see what was going on; > - Did an edit tree conflict > - Selected Keep the directory from the repository: BOOM! > - See attached picture. > I'm running Tortoise on Windows 7 Ultimate 64 bit > Dell Laptop running Intel Core 2 Duo 2GHz > 2GB Ram
Hint for the future: it's best to type (or copy/paste) the exact error message in the body of your mail. Then other users can see the error without opening the attachment, and it also helps other people find this mail thread if they are googling for a similar error message. So, the error message is: In file 'D:\Development\SVN\Releases\TortoiseSVN-1.6.6\ext\subversion\subversion\libsvn_wc\tree_conflicts.c' line 570: assertion failed (strcmp(dir_path, svn_path_dirname(victim_path, pool)) == 0) This is exactly the same error message as reported in the following issue (currently not resolved): http://subversion.tigris.org/issues/show_bug.cgi?id=3469 I can't immediately recognize your scenario as similar to the ones described in that issue (I don't see you mentioning externals). But you may want to take a look at it anyway. Johan
