subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1441047 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Thu, 31 Jan 2013 16:28:58 GMT
Author: stsp
Date: Thu Jan 31 16:28:57 2013
New Revision: 1441047

URL: http://svn.apache.org/viewvc?rev=1441047&view=rev
Log:
* subversion/libsvn_client/merge.c
  (merge_file_added, merge_file_deleted): Remove unused variables.

Modified:
    subversion/trunk/subversion/libsvn_client/merge.c

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1441047&r1=1441046&r2=1441047&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Jan 31 16:28:57 2013
@@ -2328,8 +2328,6 @@ merge_file_added(const char *relpath,
   struct merge_file_baton_t *fb = file_baton;
   const char *local_abspath = svn_dirent_join(merge_b->target->abspath,
                                               relpath, scratch_pool);
-  svn_node_kind_t kind;
-  svn_boolean_t is_deleted;
   apr_hash_t *pristine_props;
   apr_hash_t *new_props;
 
@@ -2586,8 +2584,6 @@ merge_file_deleted(const char *relpath,
   struct merge_file_baton_t *fb = file_baton;
   const char *local_abspath = svn_dirent_join(merge_b->target->abspath,
                                               relpath, scratch_pool);
-  svn_node_kind_t kind;
-  svn_boolean_t is_deleted;
   svn_boolean_t same;
 
   SVN_ERR(mark_file_edited(merge_b, fb, local_abspath, scratch_pool));



Mime
View raw message