subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1356533 - /subversion/trunk/subversion/libsvn_wc/props.c
Date Tue, 03 Jul 2012 00:47:16 GMT
Author: philip
Date: Tue Jul  3 00:47:15 2012
New Revision: 1356533

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

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

Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1356533&r1=1356532&r2=1356533&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Tue Jul  3 00:47:15 2012
@@ -1236,7 +1236,6 @@ svn_wc__merge_props(svn_skel_t **conflic
       svn_boolean_t conflict_remains;
       const svn_prop_t *incoming_change;
       const svn_string_t *from_val, *to_val, *base_val;
-      const svn_string_t *mine_val;
 
       svn_pool_clear(iterpool);
 
@@ -1256,9 +1255,6 @@ svn_wc__merge_props(svn_skel_t **conflic
       if (base_merge)
         apr_hash_set(pristine_props, propname, APR_HASH_KEY_STRING, to_val);
 
-      /* Save MINE for later message generation.  */
-      mine_val = apr_hash_get(actual_props, propname, APR_HASH_KEY_STRING);
-
       apr_hash_set(their_props, propname, APR_HASH_KEY_STRING, to_val);
 
       /* We already know that state is at least `changed', so mark



Mime
View raw message