Resolve issue #3806, "incoming replacements on local deletes produce
inconsistent tree conflicts".

* subversion/libsvn_client/merge.c
  (check_moved_away): Remove function.
  (record_tree_conflict): Specialize delete and add tree conflicts for moves.
    Store installed conflict in parent directory baton to allow specializing
    later. Make the notify optional.

  (mark_dir_edited,
   mark_file_edited): Remove tree conflict specializing here. Update caller.

  (merge_file_opened): Handle incoming replacement conflicts. Update the
    existing delete conflicts if necessary. Don't notify when overwriting the
    conflict.

  (merge_file_deleted): Update caller.

  (merge_dir_opened): Handle incoming replacement conflicts. Update the
    existing delete conflicts if necessary. Don't notify when overwriting the
    conflict.

  (merge_dir_deleted): Update caller.

* subversion/tests/cmdline/merge_tree_conflict_tests.py
  (merge_replace_causes_tree_conflict2): Remove XFail and update expected
    results for slight output changes.


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