Following up on r1438961, record additions directly in the merge code instead
of via the notification hook.

Turn the old update_the_list_of_added_subtrees() that already handled most of
this work in a record_update_add() function.

* subversion/libsvn_client/merge.c
  (record_update_add): New function, with a prototype like the other record
    functions. Integrate update_the_list_of_added_subtrees().

  (merge_file_added,
   merge_dir_added): Call record_update_add when really adding a node.

  (update_the_list_of_added_subtrees): Remove function.
  (notification_receiver): Don't call update_the_list_of_added_subtrees.
  (single_file_merge_notify): Call record_update_add for single file add
    merges.


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