* subversion/libsvn_client/merge.c   (merge_file_opened, merge_dir_opened): Preserve the merge-left node kind    when updating a tree conflict involving a replacement.   (merge_file_deleted): This function cannot tell if the deleted node is going    to be replaced, so checking the 'add_is_replace' flag here is pointless.    Record the merge-right node kind as 'none' a is appropriate for a deletion,    and rely on merge_file_opened() and merge_dir_opened() to tweak node kind    if necessary.
* subversion/libsvn_client/merge.c
  (merge_file_opened, merge_dir_opened): Preserve the merge-left node kind
   when updating a tree conflict involving a replacement.
  (merge_file_deleted): This function cannot tell if the deleted node is going
   to be replaced, so checking the 'add_is_replace' flag here is pointless.
   Record the merge-right node kind as 'none' a is appropriate for a deletion,
   and rely on merge_file_opened() and merge_dir_opened() to tweak node kind
   if necessary.

Pointed out by: rhuijben


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

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