svn commit: r1523440 - /subversion/trunk/subversion/libsvn_fs_fs/transaction.c

[stefan2]

Author: stefan2
Date: Sun Sep 15 15:15:41 2013
New Revision: 1523440

URL: http://svn.apache.org/r1523440
Log:
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

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/transaction.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/transaction.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/transaction.c?rev=1523440&r1=1523439&r2=1523440&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/transaction.c Sun Sep 15 15:15:41 
2013
@@ -688,6 +688,7 @@ fold_change(apr_hash_t *changes,
           /* An add at this point must be following a previous delete,
              so treat it just like a replace. */
           old_change->change_kind = svn_fs_path_change_replace;
+          old_change->node_kind = info->node_kind;
           old_change->node_rev_id = svn_fs_fs__id_copy(info->node_rev_id,
                                                        pool);
           old_change->text_mod = info->text_mod;