Add the 'D'elete +'A'dd is 'R'eplace logic to the merge notification code, to
make it 100% compatible with the current diff notification code.

* subversion/libsvn_client/merge.c
  (HANDLE_NOTIFY_FROM_MERGE): Move to the file header.
  (merge_cmd_baton_t): Add hash to collect to be notified paths.
  (HANDLE_NOTIFY_FROM_MERGE): Remove here.
  (record_update_add): If a delete is pending for the same path notify
    a replace.
  (record_update_delete): Store paths that are deleted, instead of directly
    notifying them.
  (merge_dir_closed): Notify deletes below the directory.
  (do_merge): (Re-)initialize the pending deletes hash.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1440077 13f79535-47bb-0310-9956-ffa450edef68