You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2010/05/21 14:48:52 UTC

svn commit: r946989 - /subversion/trunk/subversion/libsvn_client/patch.c

Author: stsp
Date: Fri May 21 12:48:52 2010
New Revision: 946989

URL: http://svn.apache.org/viewvc?rev=946989&view=rev
Log:
* subversion/libsvn_client/patch.c
  (install_patched_target): While creating missing parent directories
   for added targets, correctly account for path components that are
   already present.

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=946989&r1=946988&r2=946989&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Fri May 21 12:48:52 2010
@@ -1391,6 +1391,15 @@ install_patched_target(patch_target_t *t
           if (! target->skipped)
             {
               local_abspath = abs_wc_path;
+              for (i = 0; i < present_components; i++)
+                {
+                  const char *component;
+                  component = APR_ARRAY_IDX(components, i,
+                                            const char *);
+                  local_abspath = svn_dirent_join(local_abspath,
+                                                  component, pool);
+                }
+
               for (i = present_components; i < components->nelts - 1; i++)
                 {
                   const char *component;