subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1645669 - /subversion/branches/fsx-id/subversion/libsvn_fs_x/tree.c
Date Mon, 15 Dec 2014 14:52:35 GMT
Author: stefan2
Date: Mon Dec 15 14:52:35 2014
New Revision: 1645669

URL: http://svn.apache.org/r1645669
Log:
On the fsx-id branch: Follow-up to r1645657, fixing the tests.

* subversion/libsvn_fs_x/tree.c
  (make_path_mutable): Here, we want the node IDs, not the noderev IDs.

Modified:
    subversion/branches/fsx-id/subversion/libsvn_fs_x/tree.c

Modified: subversion/branches/fsx-id/subversion/libsvn_fs_x/tree.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-id/subversion/libsvn_fs_x/tree.c?rev=1645669&r1=1645668&r2=1645669&view=diff
==============================================================================
--- subversion/branches/fsx-id/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/branches/fsx-id/subversion/libsvn_fs_x/tree.c Mon Dec 15 14:52:35 2014
@@ -1283,9 +1283,10 @@ make_path_mutable(svn_fs_root_t *root,
       SVN_ERR(get_dag(&copyroot_node, copyroot_root, copyroot_path,
                       FALSE, pool));
 
-      child_id = svn_fs_x__dag_get_noderev_id(parent_path->node);
-      copyroot_id = svn_fs_x__dag_get_noderev_id(copyroot_node);
-      if (!svn_fs_x__id_part_eq(child_id, copyroot_id))
+      child_id = svn_fs_x__dag_get_id(parent_path->node);
+      copyroot_id = svn_fs_x__dag_get_id(copyroot_node);
+      if (!svn_fs_x__id_part_eq(svn_fs_x__id_node_id(child_id),
+                                svn_fs_x__id_node_id(copyroot_id)))
         is_parent_copyroot = TRUE;
 
       /* Now make this node mutable.  */



Mime
View raw message