svn commit: r982918 - /subversion/trunk/subversion/svnrdump/load_editor.c

[ar...@apache.org]

Author: artagnon
Date: Fri Aug  6 10:07:13 2010
New Revision: 982918

URL: http://svn.apache.org/viewvc?rev=982918&view=rev
Log:
* subversion/svnrdump/load_editor.c
  (new_node_record): Canonicalize the initial relpath.
  (new_node_record): After an add_directory, add the child_baton to
  the directory baton linked list.

Noticed by: rhuijben

Modified:
    subversion/trunk/subversion/svnrdump/load_editor.c

Modified: subversion/trunk/subversion/svnrdump/load_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/load_editor.c?rev=982918&r1=982917&r2=982918&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/load_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/load_editor.c Fri Aug  6 10:07:13 2010
@@ -148,7 +148,7 @@ new_node_record(void **node_baton,
       child_db->baton = child_baton;
       child_db->depth = 0;
       child_db->parent = NULL;
-      child_db->relpath = apr_pstrdup(rb->pool, "/");
+      child_db->relpath = svn_relpath_canonicalize("/", rb->pool);
       rb->db = child_db;
   }
 
@@ -250,6 +250,13 @@ new_node_record(void **node_baton,
                                                nb->copyfrom_rev,
                                                rb->pool, &child_baton));
           LDR_DBG(("Adding dir %s to dir %p as %p\n", nb->path, rb->db->baton, child_baton));
+          child_db = apr_pcalloc(rb->pool, sizeof(*child_db));
+          child_db->baton = child_baton;
+          child_db->depth = rb->db->depth + 1;
+          child_db->relpath = svn_relpath_join(rb->db->relpath,
+                                               residual_path->elts + i,
+                                               rb->pool);
+          rb->db = child_db;
           break;
         default:
           break;