[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-cvs
Subject:    svn commit: r39718 - trunk/subversion/libsvn_fs_base
From:       Bert Huijben <rhuijben () sharpsvn ! net>
Date:       2009-09-30 18:35:44
Message-ID: 200909301835.n8UIZihd014739 () svn2 ! sjc ! collab ! net
[Download RAW message or body]

Author: rhuijben
Date: Wed Sep 30 11:35:44 2009
New Revision: 39718

Log:
* subversion/libsvn_fs_base/dag.c
  (make_entry,
   svn_fs_base__dag_clone_child,
   svn_fs_base__dag_copy): Don't join in-repository paths as dirents, as this
     fails on paths like 'c:hi'

Modified:
   trunk/subversion/libsvn_fs_base/dag.c

Modified: trunk/subversion/libsvn_fs_base/dag.c
URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_base/dag.c?pathrev=39718&r1=39717&r2=39718
 ==============================================================================
--- trunk/subversion/libsvn_fs_base/dag.c	Wed Sep 30 11:26:31 2009	(r39717)
+++ trunk/subversion/libsvn_fs_base/dag.c	Wed Sep 30 11:35:44 2009	(r39718)
@@ -479,7 +479,7 @@ make_entry(dag_node_t **child_p,
   /* Create the new node's NODE-REVISION */
   memset(&new_noderev, 0, sizeof(new_noderev));
   new_noderev.kind = is_dir ? svn_node_dir : svn_node_file;
-  new_noderev.created_path = svn_dirent_join(parent_path, name, pool);
+  new_noderev.created_path = svn_uri_join(parent_path, name, pool);
   SVN_ERR(svn_fs_base__create_node
           (&new_node_id, svn_fs_base__dag_get_fs(parent), &new_noderev,
            svn_fs_base__id_copy_id(svn_fs_base__dag_get_id(parent)),
@@ -761,7 +761,7 @@ svn_fs_base__dag_clone_child(dag_node_t 
       noderev->predecessor_id = cur_entry->id;
       if (noderev->predecessor_count != -1)
         noderev->predecessor_count++;
-      noderev->created_path = svn_dirent_join(parent_path, name, pool);
+      noderev->created_path = svn_uri_join(parent_path, name, pool);
       SVN_ERR(svn_fs_base__create_successor(&new_node_id, fs, cur_entry->id,
                                             noderev, copy_id, txn_id,
                                             trail, pool));
@@ -1427,7 +1427,7 @@ svn_fs_base__dag_copy(dag_node_t *to_nod
       noderev->predecessor_id = svn_fs_base__id_copy(src_id, pool);
       if (noderev->predecessor_count != -1)
         noderev->predecessor_count++;
-      noderev->created_path = svn_dirent_join
+      noderev->created_path = svn_uri_join
         (svn_fs_base__dag_get_created_path(to_node), entry, pool);
       SVN_ERR(svn_fs_base__create_successor(&id, fs, src_id, noderev,
                                             copy_id, txn_id, trail, pool));

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2402234


[prev in list] [next in list] [prev in thread] [next in thread]