> > In file > 'D:\Development\SVN\Releases\TortoiseSVN-1.7.1\ext\subversion\subversion\libsvn_wc\update_editor.c' > line 1582: assertion failed (action == svn_wc_conflict_action_edit || > action > == svn_wc_conflict_action_delete || action == > svn_wc_conflict_action_replace)
Please update to the current release of TortoiseSVN and/or Subversion to see if this was resolved already. A number of bug fixes have been made.
