Remove the assumption that deleted directories must still exist from the merge code in libsvn_client. This fixes several tests for Single-DB.
Remove the assumption that deleted directories must still exist from the
merge code in libsvn_client. This fixes several tests for Single-DB.

After we switch to single-db we should remove the assumption that directories
can still exist when deleted.

* subversion/libsvn_client/merge.c
  (obstructed_or_missing): Make this function return errors for easier
    (future) debugging. When a node is a deleted directory and it's missing
    check if it is obstructed and if not assume that no directory is ok.
  (merge_props_changed,
   merge_file_changed,
   merge_file_added,
   merge_file_deleted,
   merge_dir_added,
   merge_dir_deleted,
   merge_dir_opened): Update callers.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@982386 13f79535-47bb-0310-9956-ffa450edef68

wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion