* 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.


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

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