Clean up merge notification code.
Clean up merge notification code.

* subversion/libsvn_client/merge.c
  (conflict_resolver_baton_t, notification_receiver_baton_t): Say what's
    important about the 'pool' member (its lifetime) instead of talking
    about what the notification receiver does.
  (notify_merge_begin, notify_mergeinfo_recording, notify_merge_completed):
    New functions, factored out from several places.
  (notification_receiver): Document this function's purpose in detail. Don't
    bother checking for the 'starting to record mergeinfo' notification,
    because we already didn't use this function for that notification (and
    anyway the other terms of the 'if' condition would be sufficient).
  (single_file_merge_notify): Don't take a pre-constructed merge-begin
    notification struct and pass it through notification_receiver(), just
    take the information necessary to construct one and pass that directly
    to notify_merge_begin().
  (do_file_merge): Don't construct a merge-begin notification struct for
    single_file_merge_notify(), just pass the relevant revision range.  Use
    notify_mergeinfo_recording().
  (merge_cousins_and_supplement_mergeinfo, record_mergeinfo_for_dir_merge,
   do_merge, merge_cousins_and_supplement_mergeinfo): Use the factored out
    notification functions.


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

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion