subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbu...@apache.org
Subject svn commit: r1330544 - in /subversion/branches/1.7.x-issue4169: ./ subversion/libsvn_client/merge.c
Date Wed, 25 Apr 2012 20:37:20 GMT
Author: pburba
Date: Wed Apr 25 20:37:19 2012
New Revision: 1330544

URL: http://svn.apache.org/viewvc?rev=1330544&view=rev
Log:
On the 1.7.x-issue4169 backport branch: Merge r1330520 from trunk.

Modified:
    subversion/branches/1.7.x-issue4169/   (props changed)
    subversion/branches/1.7.x-issue4169/subversion/libsvn_client/merge.c

Propchange: subversion/branches/1.7.x-issue4169/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1330520

Modified: subversion/branches/1.7.x-issue4169/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4169/subversion/libsvn_client/merge.c?rev=1330544&r1=1330543&r2=1330544&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4169/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/1.7.x-issue4169/subversion/libsvn_client/merge.c Wed Apr 25 20:37:19
2012
@@ -2646,7 +2646,7 @@ notification_receiver(void *baton, const
             {
               const char *added_path_parent =
                 svn_dirent_dirname(notify->path, pool);
-              apr_pool_t *iterpool = svn_pool_create(pool);
+              apr_pool_t *subpool = svn_pool_create(pool);
 
               /* Is NOTIFY->PATH the root of an added subtree? */
               while (strcmp(notify_b->merge_b->target_abspath,
@@ -2660,12 +2660,11 @@ notification_receiver(void *baton, const
                       break;
                     }
 
-                  svn_pool_clear(iterpool);
                   added_path_parent = svn_dirent_dirname(
-                    added_path_parent, iterpool);
+                    added_path_parent, subpool);
                 }
 
-              svn_pool_destroy(iterpool);
+              svn_pool_destroy(subpool);
             }
 
           if (root_of_added_subtree)



Mime
View raw message