subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbu...@apache.org
Subject svn commit: r1332290 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Mon, 30 Apr 2012 16:56:21 GMT
Author: pburba
Date: Mon Apr 30 16:56:21 2012
New Revision: 1332290

URL: http://svn.apache.org/viewvc?rev=1332290&view=rev
Log:
* subversion/libsvn_client/merge.c
  (update_the_list_of_added_subtrees): Small memory optimization.

Suggested by: gstein
 

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=1332290&r1=1332289&r2=1332290&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Apr 30 16:56:21 2012
@@ -2841,9 +2841,9 @@ update_the_list_of_added_subtrees(const 
     }
   else
     {
-      const char *added_path_parent =
-        svn_dirent_dirname(added_abspath, scratch_pool);
       apr_pool_t *subpool = svn_pool_create(scratch_pool);
+      const char *added_path_parent =
+        svn_dirent_dirname(added_abspath, subpool);
 
       /* Is NOTIFY->PATH the root of an added subtree? */
       while (strcmp(target_abspath, added_path_parent))



Mime
View raw message