Record operative merge actions directly in the merge code instead of via
hooking the notifications: handle changed files and directories.

* subversion/libsvn_client/merge.c
  (record_update_add): Store added paths as modified.
  (record_update_update): New function.
  (merge_dir_props_changed,
   merge_file_changed): Call record_update_update when we modified something.
  (notification_receiver): Don't calculate what are changes and what not.
  (single_file_merge_notify): And handle recording here.


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