Hi,

I'm trying to update a working copy of some tens of GBs with svn 1.7.1 (upgraded the WC to the new -sadly much slower- format) and always get this:
$ svn up
Updating '.':
Skipped 'mail/20110624/usr/local/etc/blacklist' -- Node remains in conflict
svn: E235000: In file '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)
Abort (core dumped)
If I delete that file, I can get past it, but receive another crash, now without any clues about what should I remove:
$ svn up
Updating '.':
svn: E235000: In file '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)
Abort (core dumped)

Bug or feature?