Ho-hum, remove some more svn_wc_entry_t's from the merge code.
Ho-hum, remove some more svn_wc_entry_t's from the merge code.

* subversion/libsvn_client/merge.c
  (filter_merged_revisions): Remove ENTRY arg, we weren't doing anything
   with it anymore.

  (calculate_remaining_ranges): Update call to filter_merged_revisions
   and use use transitional svn_wc__node_* APIs, allowing removal of this
   function's ENTRY arg.

  (populate_remaining_ranges): Update call to calculate_remaining_ranges(),
   and get rid of local svn_wc_entry_t which existed only to be passed
   to that function.

  (do_file_merge): Update call to calculate_remaining_ranges().


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

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