Another entry_t down.
Another entry_t down.

* subversion/libsvn_client/merge.c
  (obstructed_or_missing):
    Use wc-ng API instead of svn_wc__get_entry_versioned(), and much simplify
    this function in the process. Untangle, rinse and dry.
  (node_kind_working, node_kind_on_disk):
    Remove these ghastly two functions and incorporate into
    obstructed_or_missing(), the way it should always have been.


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

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