* subversion/libsvn_client/merge.c   (calculate_requested_ranges, calculate_merge_ranges): Rename to    filter_reflected_revisions() and filter_merged_revisions(),    respectively.   (calculate_remaining_ranges): Update for API changes.
* subversion/libsvn_client/merge.c
  (calculate_requested_ranges, calculate_merge_ranges): Rename to
   filter_reflected_revisions() and filter_merged_revisions(),
   respectively.
  (calculate_remaining_ranges): Update for API changes.

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