subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1022457 - /subversion/trunk/subversion/libsvn_wc/workqueue.c
Date Thu, 14 Oct 2010 10:33:23 GMT
Author: ehu
Date: Thu Oct 14 10:33:22 2010
New Revision: 1022457

URL: http://svn.apache.org/viewvc?rev=1022457&view=rev
Log:
Follow up to r1022440,1022433: really fix revert after function simplification.

Modified:
    subversion/trunk/subversion/libsvn_wc/workqueue.c

Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=1022457&r1=1022456&r2=1022457&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Thu Oct 14 10:33:22 2010
@@ -338,28 +338,26 @@ run_revert(svn_wc__db_t *db,
     }
 
 
-  if (is_wc_root)
-    /* ### A working copy root can't have a working node. Don't try removing. */
-    return SVN_NO_ERROR;
+  if (! is_wc_root) {
+    /* A working copy root can't have a working node. Don't try removing. */
+    const char *op_root_abspath;
 
 
-  /* Remove the WORKING version of the node */
-  /* If the node is not the operation root,
-     we should not delete the working node */
-  if (status == svn_wc__db_status_added)
-    {
-      const char *op_root_abspath = NULL;
 
+    /* Remove the WORKING version of the node */
+    /* If the node is not the operation root,
+       we should not delete the working node */
+    if (status == svn_wc__db_status_added)
       SVN_ERR(svn_wc__db_scan_addition(NULL, &op_root_abspath, NULL, NULL,
                                        NULL, NULL, NULL, NULL, NULL,
                                        db, local_abspath,
                                        scratch_pool, scratch_pool));
 
-      if (!op_root_abspath
-          || (strcmp(op_root_abspath, local_abspath) == 0))
-        SVN_ERR(svn_wc__db_temp_op_remove_working(db, local_abspath,
-                                                  scratch_pool));
-    }
+    if (!op_root_abspath
+        || (strcmp(op_root_abspath, local_abspath) == 0))
+      SVN_ERR(svn_wc__db_temp_op_remove_working(db, local_abspath,
+                                                scratch_pool));
+  }
 
   return SVN_NO_ERROR;
 }



Mime
View raw message