Combine the handling of dry-run-deleted and pending deletes code by using a single hash of deleted directories per merge_dir_baton_t.
Combine the handling of dry-run-deleted and pending deletes code by using
a single hash of deleted directories per merge_dir_baton_t.

* subversion/libsvn_client/merge.c
  (merge_cmd_baton_t): Remove dry run deletions and pending deletes hashes.
  (dry_run_deleted_p): Remove now unneeded function.
  (perform_obstruction_check): Remove last remaining dry run specialized
    handling.

  (merge_dir_baton_t): Add pool, boolean and pending deletes hash.
  (merge_file_baton_t): Add two booleans.

  (record_update_add): Use boolean argument to determine how to notify.
  (record_update_delete): Unconditionally store deletes in the parent baton.

  (handle_pending_notifications): Just notify all paths in the pending hash.

  (merge_file_opened): Calculate replace. Skip obstruction check in dry run
    mode for adds that follow a delete.
  (merge_file_added): Pass replace info to notify handling.
  (merge_file_deleted): Remove dry run administration. Update caller.

  (merge_dir_opened): Calculate replace. Skip obstruction check in dry run
    mode for adds that follow a delete.
  (merge_dir_added): Pass replace info to notify handling.
  (merge_dir_changed): Update caller.
  (merge_dir_deleted): Remove dry run administration. Update caller.
  (merge_dir_closed): Update caller.

  (do_file_merge): Provide a minimal directory baton for the delete and
     add logic.

  (do_merge): Don't initialize now deleted variables.


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

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