All pastes #26666 Raw Edit

Stuff

public text v1 · immutable
#26666 ·published 2005-10-25 21:58 UTC
rendered paste body
Index: subversion/libsvn_wc/adm_ops.c
===================================================================
--- subversion/libsvn_wc/adm_ops.c      (revision 17008)
+++ subversion/libsvn_wc/adm_ops.c      (working copy)
@@ -1331,7 +1331,7 @@
   const char *bprop, *rprop, *wprop; /* full paths */
   const char *local_bprop, *local_rprop, *local_wprop; /* relative paths */
   const char *adm_path = svn_wc_adm_access_path (adm_access);
-  int access_len = strlen (adm_path) + 1;
+  int access_len = strlen (adm_path);
  
   /* Build the full path of the thing we're reverting. */
   fullpath = svn_wc_adm_access_path (adm_access);
@@ -1712,12 +1712,12 @@
     {
       /* Revert the prop and text mods (if any). */
       if (entry->kind == svn_node_file)
-        SVN_ERR (revert_admin_things (parent_access, bname,
+        SVN_ERR (revert_admin_things (dir_access, bname,
                                       entry, &reverted,
                                       use_commit_times, pool));
  
       if (entry->kind == svn_node_dir)
-        SVN_ERR (revert_admin_things (dir_access, SVN_WC_ENTRY_THIS_DIR, entry,+        SVN_ERR (revert_admin_things (dir_access, "", entry,
                                       &reverted, use_commit_times, pool));
  
       /* Force recursion on replaced directories. */