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: https://svn.apache.org/repos/asf/subversion/trunk@1523440 13f79535-47bb-0310-9956-ffa450edef68