Author: hwright
Date: Sat Apr 14 12:48:00 2012
New Revision: 1326099

URL: http://svn.apache.org/viewvc?rev=1326099&view=rev
Log:
On the ev2-export branch:
* subversion/libsvn_client/add.c
  (drive_editor): Move the relpath calculation so that we have the correct
    key from the children hash.

Modified:
    subversion/branches/ev2-export/subversion/libsvn_client/add.c

Modified: subversion/branches/ev2-export/subversion/libsvn_client/add.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/add.c?rev=1326099&r1=1326098&r2=1326099&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/add.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/add.c Sat Apr 14 
12:48:00 2012
@@ -758,13 +758,13 @@ drive_editor(svn_editor_t *editor,
       apr_array_header_t *children;
 
       svn_pool_clear(iterpool);
-      path = svn_relpath_join(base_relpath, path, iterpool);
 
       children = apr_hash_get(children_hash, path, APR_HASH_KEY_STRING);
       if (!children)
         children = apr_array_make(iterpool, 1, sizeof(const char *));
 
       SVN_ERR(svn_path_check_valid(path, iterpool));
+      path = svn_relpath_join(base_relpath, path, iterpool);
       err = svn_editor_add_directory(editor, path, children, empty_props,
                                      SVN_INVALID_REVNUM);
       if (err)


Reply via email to