* subversion/libsvn_wc/update_editor.c   (add_directory): When handling a local delete for a tree conflict, use     the db operation for delete instead of handling the delete via     svn_wc__entry_modify2().
* subversion/libsvn_wc/update_editor.c
  (add_directory): When handling a local delete for a tree conflict, use
    the db operation for delete instead of handling the delete via
    svn_wc__entry_modify2().

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion