subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1309995 - /subversion/trunk/subversion/libsvn_client/copy.c
Date Thu, 05 Apr 2012 18:28:52 GMT
Author: hwright
Date: Thu Apr  5 18:28:52 2012
New Revision: 1309995

URL: http://svn.apache.org/viewvc?rev=1309995&view=rev
Log:
Ev2 shims: Followup to r1309951 by skipping commit items without local paths.

Current number of failing Ev2 tests over neon: 11
Current number of failing Ev2 tests over serf: 10

* subversion/libsvn_client/copy.c
  (wc_to_repos_copy): Skip commit items without paths (e.g., directories
    inserted as a result of 'cp --parents').

Modified:
    subversion/trunk/subversion/libsvn_client/copy.c

Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1309995&r1=1309994&r2=1309995&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Thu Apr  5 18:28:52 2012
@@ -1408,13 +1408,20 @@ wc_to_repos_copy(const apr_array_header_
                                             commit_items, pool));
 
 #if ENABLE_EV2_SHIMS
-  common_wc_abspath = APR_ARRAY_IDX(commit_items, 0,
-                                    svn_client_commit_item3_t *)->path;
-  for (i = 1; i < commit_items->nelts; i++)
+  for (i = 0; !common_wc_abspath && i < commit_items->nelts; i++)
+    {
+      common_wc_abspath = APR_ARRAY_IDX(commit_items, i,
+                                        svn_client_commit_item3_t *)->path;
+    }
+
+  for (; i < commit_items->nelts; i++)
     {
       svn_client_commit_item3_t *item =
         APR_ARRAY_IDX(commit_items, i, svn_client_commit_item3_t *);
 
+      if (!item->path)
+        continue;
+
       common_wc_abspath = svn_dirent_get_longest_ancestor(common_wc_abspath,
                                                           item->path, pool);
     }



Mime
View raw message