subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r906129 - /subversion/trunk/subversion/libsvn_client/patch.c
Date Wed, 03 Feb 2010 17:15:41 GMT
Author: stsp
Date: Wed Feb  3 17:15:41 2010
New Revision: 906129

URL: http://svn.apache.org/viewvc?rev=906129&view=rev
Log:
* subversion/libsvn_client/patch.c
  (install_patched_target): Fix a silly bug which caused us to try to create
   parent directories which already exist and are versioned. The code was
   creating the leading (and possibly existing) N of M components of the path
   to the missing target, but is supposed to create the trailing (and
   determined to be missing) N of M components.

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

Modified: subversion/trunk/subversion/libsvn_client/patch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/patch.c?rev=906129&r1=906128&r2=906129&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Wed Feb  3 17:15:41 2010
@@ -1183,14 +1183,14 @@
         {
           const char *abs_path;
           apr_array_header_t *components;
-          int missing_components;
+          int present_components;
           int i;
           apr_pool_t *iterpool;
 
           /* Check if we can safely create the target's parent. */
           abs_path = apr_pstrdup(pool, abs_wc_path);
           components = svn_path_decompose(target->rel_path, pool);
-          missing_components = 0;
+          present_components = 0;
           iterpool = svn_pool_create(pool);
           for (i = 0; i < components->nelts - 1; i++)
             {
@@ -1230,15 +1230,15 @@
                       target->skipped = TRUE;
                       break;
                     }
-                }
 
-              missing_components++;
+                  present_components++;
+                }
             }
 
           if (! target->skipped)
             {
               abs_path = abs_wc_path;
-              for (i = 0; i < missing_components; i++)
+              for (i = present_components; i < components->nelts - 1; i++)
                 {
                   const char *component;
                   svn_wc_status2_t *status;



Mime
View raw message