You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2016/11/26 13:54:38 UTC
svn commit: r1771485 -
/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Author: stsp
Date: Sat Nov 26 13:54:38 2016
New Revision: 1771485
URL: http://svn.apache.org/viewvc?rev=1771485&view=rev
Log:
Fix the recursive tree walk logic for updating incoming moves.
* subversion/libsvn_wc/wc_db_update_move.c
(update_incoming_moved_node): Continue walking based on whether the WORKING
layer node is a directory, not whether the old victim node is a directory.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1771485&r1=1771484&r2=1771485&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Sat Nov 26 13:54:38 2016
@@ -2453,7 +2453,7 @@ update_incoming_moved_node(node_move_bat
if (nmb->skip)
return SVN_NO_ERROR;
- if (orig_kind == svn_node_dir)
+ if (working_kind == svn_node_dir)
{
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
int i = 0, j = 0;