You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2016/10/12 13:30:13 UTC
svn commit: r1764463 -
/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Author: rhuijben
Date: Wed Oct 12 13:30:13 2016
New Revision: 1764463
URL: http://svn.apache.org/viewvc?rev=1764463&view=rev
Log:
Revert r1764453, as it has unexpected side effects.
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=1764463&r1=1764462&r2=1764463&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Wed Oct 12 13:30:13 2016
@@ -1335,7 +1335,7 @@ tc_editor_delete(node_move_baton_t *nmb,
update_move_baton_t *b = nmb->umb;
svn_sqlite__stmt_t *stmt;
const char *local_abspath;
- svn_boolean_t is_modified;
+ svn_boolean_t is_modified, is_all_deletes;
svn_skel_t *work_items = NULL;
svn_skel_t *conflict = NULL;
@@ -1356,7 +1356,7 @@ tc_editor_delete(node_move_baton_t *nmb,
}
local_abspath = svn_dirent_join(b->wcroot->abspath, relpath, scratch_pool);
- SVN_ERR(svn_wc__node_has_local_mods(&is_modified, NULL,
+ SVN_ERR(svn_wc__node_has_local_mods(&is_modified, &is_all_deletes,
nmb->umb->db, local_abspath, FALSE,
NULL, NULL, scratch_pool));
if (is_modified)