Follow-up to r1517479:  If a FSFS replacement operation replaces a file with a dir or vice versa, the kind specified in the changed paths list must be the new node kind.
Follow-up to r1517479:  If a FSFS replacement operation replaces a
file with a dir or vice versa, the kind specified in the changed paths
list must be the new node kind.

* subversion/libsvn_fs_fs/transaction.c
  (fold_change): use the kind of the added node in replacements

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

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