svn commit: r1346078 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

[rh...@apache.org]

Author: rhuijben
Date: Mon Jun  4 18:34:38 2012
New Revision: 1346078

URL: http://svn.apache.org/viewvc?rev=1346078&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (db_base_remove): Revert r1346063, as the retraction of a parent deletion
    may void the assumption done here. Needs more checks.

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=1346078&r1=1346077&r2=1346078&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Jun  4 18:34:38 2012
@@ -1957,6 +1957,8 @@ db_base_remove(void *baton,
   SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath));
   SVN_ERR(svn_sqlite__step_done(stmt));
 
+  SVN_ERR(retract_parent_delete(wcroot, local_relpath, scratch_pool));
+
   /* If there is no working node then any actual node must be deleted,
      unless it marks a conflict */
   SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
@@ -1971,8 +1973,6 @@ db_base_remove(void *baton,
       SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath));
       SVN_ERR(svn_sqlite__step_done(stmt));
     }
-  else
-    SVN_ERR(retract_parent_delete(wcroot, local_relpath, scratch_pool));
 
   return SVN_NO_ERROR;
 }