Refactor 'remaining_ranges' calculation.
Refactor 'remaining_ranges' calculation.

* subversion/libsvn_client/merge.c
  (calculate_remaining_ranges): New function.
  (do_merge, do_single_file_merge): Move a chunk of code dealing with 
   remaining_ranges calculation to 'calculate_remaining_ranges' and call
   the same.


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

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