subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1667839 - in /subversion/branches/1.9.x: ./ STATUS subversion/libsvn_client/copy.c
Date Thu, 19 Mar 2015 18:24:08 GMT
Author: svn-role
Date: Thu Mar 19 18:24:07 2015
New Revision: 1667839

URL: http://svn.apache.org/r1667839
Log:
Merge r1664653 from trunk:

 * r1664653
   Fix segfault when performing 'svn cp --pin-externals WC URL' against old
   server over http.
   Justification:
     Fixes segfault on --disable-http-v2.
   Votes:
     +1: rhuijben, brane, stefan2

Modified:
    subversion/branches/1.9.x/   (props changed)
    subversion/branches/1.9.x/STATUS
    subversion/branches/1.9.x/subversion/libsvn_client/copy.c

Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 19 18:24:07 2015
@@ -89,4 +89,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664927,1665164,1665611-1665612,1665845,1665850,1665852,1665886,1666270,1666272,1666690,1666851
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664927,1665164,1665611-1665612,1665845,1665850,1665852,1665886,1666270,1666272,1666690,1666851

Modified: subversion/branches/1.9.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1667839&r1=1667838&r2=1667839&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Thu Mar 19 18:24:07 2015
@@ -178,14 +178,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1664653
-   Fix segfault when performing 'svn cp --pin-externals WC URL' against old
-   server over http.
-   Justification:
-     Fixes segfault on --disable-http-v2.
-   Votes:
-     +1: rhuijben, brane, stefan2
-
  * r1664684
    svnrdump: don't provide HEAD+1 as base revision when loading deletes.
    Justification:

Modified: subversion/branches/1.9.x/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_client/copy.c?rev=1667839&r1=1667838&r2=1667839&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_client/copy.c (original)
+++ subversion/branches/1.9.x/subversion/libsvn_client/copy.c Thu Mar 19 18:24:07 2015
@@ -1920,6 +1920,9 @@ queue_prop_change_commit_items(const cha
       item->url = commit_url;
       item->kind = svn_node_dir;
       item->state_flags = SVN_CLIENT_COMMIT_ITEM_PROP_MODS;
+
+      item->incoming_prop_changes = apr_array_make(result_pool, 1,
+                                                   sizeof(svn_prop_t *));
       APR_ARRAY_PUSH(commit_items, svn_client_commit_item3_t *) = item;
     }
   else



Mime
View raw message