Author: stefan2
Date: Fri Feb 6 08:40:35 2015
New Revision: 1657756
URL: http://svn.apache.org/r1657756
Log:
Fix "variable 'shadowed' set but not used" compiler warning.
This seems to be a fallout of r1657725.
* subversion/libsvn_wc/wc_db_update_move.c
(tc_editor_add_directory): Remove write-only variable IS_CONFLICT.
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=1657756&r1=1657755&r2=1657756&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Fri Feb 6
08:40:35 2015
@@ -522,7 +522,6 @@ tc_editor_add_directory(svn_boolean_t *t
{
const char *move_dst_repos_relpath;
svn_node_kind_t move_dst_kind;
- svn_boolean_t is_conflicted = FALSE;
const char *local_abspath;
svn_node_kind_t old_kind;
svn_skel_t *work_item = NULL;
@@ -582,7 +581,6 @@ tc_editor_add_directory(svn_boolean_t *t
scratch_pool, scratch_pool));
*tree_conflicted = TRUE;
action = svn_wc_notify_tree_conflict;
- is_conflicted = TRUE;
break;
case svn_node_none:
