subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1661671 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Date Mon, 23 Feb 2015 13:47:00 GMT
Author: rhuijben
Date: Mon Feb 23 13:47:00 2015
New Revision: 1661671

URL: http://svn.apache.org/r1661671
Log:
I did it again... I left an SVN_DBG() call :(

* subversion/libsvn_wc/wc_db.c
  (db_base_remove): Remove SVN_DBG() call.

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

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1661671&r1=1661670&r2=1661671&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Feb 23 13:47:00 2015
@@ -2124,6 +2124,7 @@ db_base_remove(svn_wc__db_wcroot_t *wcro
   svn_boolean_t keep_working;
   int op_depth;
   svn_node_kind_t wrk_kind;
+  svn_boolean_t no_delete_wc = FALSE;
 
   SVN_ERR(svn_wc__db_base_get_info_internal(&status, &kind, &revision,
                                             &repos_relpath, &repos_id,
@@ -2153,9 +2154,12 @@ db_base_remove(svn_wc__db_wcroot_t *wcro
       if (presence == svn_wc__db_status_base_deleted)
         {
           keep_working = FALSE;
+          no_delete_wc = TRUE;
         }
       else
-        keep_working = TRUE;
+        {
+          keep_working = TRUE;
+        }
     }
   else
     keep_working = FALSE;
@@ -2175,7 +2179,7 @@ db_base_remove(svn_wc__db_wcroot_t *wcro
 
   /* Step 1: Create workqueue operations to remove files and dirs in the
      local-wc */
-  if (!keep_working)
+  if (!keep_working && !no_delete_wc)
     {
       svn_skel_t *work_item;
       const char *local_abspath;



Mime
View raw message