subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1731270 - /subversion/trunk/subversion/libsvn_wc/conflicts.c
Date Fri, 19 Feb 2016 16:19:36 GMT
Author: stsp
Date: Fri Feb 19 16:19:36 2016
New Revision: 1731270

URL: http://svn.apache.org/viewvc?rev=1731270&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
  (svn_wc__conflict_tree_update_raise_moved_away): Remove unused variable.

Modified:
    subversion/trunk/subversion/libsvn_wc/conflicts.c

Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1731270&r1=1731269&r2=1731270&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Fri Feb 19 16:19:36 2016
@@ -3487,7 +3487,6 @@ svn_wc__conflict_tree_update_raise_moved
   svn_wc_conflict_action_t action;
   svn_wc_operation_t operation;
   svn_boolean_t tree_conflicted;
-  const char *src_op_root_abspath;
   const apr_array_header_t *conflicts;
   svn_skel_t *conflict_skel;
 
@@ -3504,8 +3503,7 @@ svn_wc__conflict_tree_update_raise_moved
   if (!tree_conflicted)
     return SVN_NO_ERROR;
 
-  SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, &action,
-                                              &src_op_root_abspath,
+  SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, &action, NULL,
                                               wc_ctx->db, local_abspath,
                                               conflict_skel,
                                               scratch_pool, scratch_pool));



Mime
View raw message