All pastes #596341 Raw Edit

Someone

public text v1 · immutable
#596341 ·published 2007-06-29 21:38 UTC
rendered paste body
Index: subversion/libsvn_wc/adm_ops.c
===================================================================
--- subversion/libsvn_wc/adm_ops.c	(revision 25588)
+++ subversion/libsvn_wc/adm_ops.c	(working copy)
@@ -2130,6 +2130,22 @@
           SVN_ERR(revert_admin_things(dir_access, SVN_WC_ENTRY_THIS_DIR, entry,
                                       &reverted, use_commit_times, pool));
 
+          /* Also revert the entry in the parent. */
+          if (reverted && bname)
+            {
+              svn_boolean_t dummy_reverted;
+              svn_wc_entry_t *entry_in_parent;
+              apr_hash_t *entries;
+
+              SVN_ERR(svn_wc_entries_read(&entries, parent_access, TRUE,
+                                          pool));
+              entry_in_parent = apr_hash_get(entries, bname,
+                                             APR_HASH_KEY_STRING);
+              SVN_ERR(revert_admin_things(parent_access, bname,
+                                          entry_in_parent, &dummy_reverted,
+                                          use_commit_times, pool));
+            }          
+
           /* Force recursion on replaced directories. */
           if (entry->schedule == svn_wc_schedule_replace)
             recursive = TRUE;