subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1562348 - in /subversion/branches/1.8.x: ./ STATUS subversion/libsvn_ra_serf/commit.c
Date Wed, 29 Jan 2014 04:04:36 GMT
Author: svn-role
Date: Wed Jan 29 04:04:35 2014
New Revision: 1562348

URL: http://svn.apache.org/r1562348
Log:
Merge the r1553376 group from trunk:

 * r1553376, r1553377
   Fix pool lifetime issue in serf commit processing for copied files and dirs
   Justification:
     Pool lifetime issues are bad. Reported by several git-svn users.
   Votes:
     +1: rhuijben, stefan2, philip

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/libsvn_ra_serf/commit.c

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1553376-1553377

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1562348&r1=1562347&r2=1562348&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Jan 29 04:04:35 2014
@@ -256,13 +256,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1553376, r1553377
-   Fix pool lifetime issue in serf commit processing for copied files and dirs
-   Justification:
-     Pool lifetime issues are bad. Reported by several git-svn users.
-   Votes:
-     +1: rhuijben, stefan2, philip
-
  * r1553101, r1553105, r1553113
    Resolve performance regression in certain 'svn log' scenarios, especially
    against pre Subversion 1.5 servers.

Modified: subversion/branches/1.8.x/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_ra_serf/commit.c?rev=1562348&r1=1562347&r2=1562348&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_ra_serf/commit.c Wed Jan 29 04:04:35 2014
@@ -1638,7 +1638,7 @@ add_directory(const char *path,
   dir->added = TRUE;
   dir->base_revision = SVN_INVALID_REVNUM;
   dir->copy_revision = copyfrom_revision;
-  dir->copy_path = copyfrom_path;
+  dir->copy_path = apr_pstrdup(dir->pool, copyfrom_path);
   dir->relpath = apr_pstrdup(dir->pool, path);
   dir->name = svn_relpath_basename(dir->relpath, NULL);
   dir->changed_props = apr_hash_make(dir->pool);
@@ -1880,7 +1880,7 @@ add_file(const char *path,
   new_file->name = svn_relpath_basename(new_file->relpath, NULL);
   new_file->added = TRUE;
   new_file->base_revision = SVN_INVALID_REVNUM;
-  new_file->copy_path = copy_path;
+  new_file->copy_path = apr_pstrdup(new_file->pool, copy_path);
   new_file->copy_revision = copy_revision;
   new_file->changed_props = apr_hash_make(new_file->pool);
   new_file->removed_props = apr_hash_make(new_file->pool);



Mime
View raw message