Make one more merge function handle its obstructions explicitly.
Make one more merge function handle its obstructions explicitly.

* subversion/libsvn_client/merge.c
  (perform_obstruction_check): Initialize kind and set some values for
    dry run deleted nodes.
  (merge_dir_props_changed): Remove unused variable.
  (merge_dir_deleted): Move registration of deletion to after the check.
    Use optional arguments of perform_obstruction_check instead of separate
    db calls. Calculate wc kind from returned kind.

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