svn commit: r1417968 - /subversion/trunk/subversion/libsvn_wc/props.c

[julianfoad]

Author: julianfoad
Date: Thu Dec  6 16:07:07 2012
New Revision: 1417968

URL: http://svn.apache.org/viewvc?rev=1417968&view=rev
Log:
* subversion/libsvn_wc/props.c
  (svn_wc__merge_props): Eliminate some unnecessary copying.

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=1417968&r1=1417967&r2=1417968&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Thu Dec  6 16:07:07 2012
@@ -1206,7 +1206,7 @@ svn_wc__merge_props(svn_skel_t **conflic
   *new_actual_props = NULL;
 
   if (!server_baseprops)
-    server_baseprops = apr_hash_copy(scratch_pool, pristine_props);
+    server_baseprops = pristine_props;
 
   their_props = apr_hash_copy(scratch_pool, server_baseprops);
 
@@ -1282,10 +1282,9 @@ svn_wc__merge_props(svn_skel_t **conflic
           set_prop_merge_state(state, svn_wc_notify_state_conflicted);
 
           if (!conflict_props)
-            conflict_props = apr_hash_make(result_pool);
+            conflict_props = apr_hash_make(scratch_pool);
 
-          apr_hash_set(conflict_props, apr_pstrdup(result_pool, propname),
-                       APR_HASH_KEY_STRING, "");
+          apr_hash_set(conflict_props, propname, APR_HASH_KEY_STRING, "");
         }
 
     }  /* foreach propchange ... */