Drive mergeinfo recording based on how we merge instead of by how the working
copy looks at the time of recording. This to avoid the performance penalty of
checking and to help catch possible merge algorithm problems.

* subversion/libsvn_client/merge.c
  (CHILDREN_WITH_MERGEINFO): Tweak comment.
  (merge_cmd_baton_t): Add deleted abspaths variable.
  (record_update_add): Remove from deleted, once re-added.
  (record_update_delete): Stop recording as merged_abspath.
  (merge_file_deleted,
   merge_dir_deleted): Record delete roots.


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