Author: ehu
Date: Fri Oct 15 20:44:12 2010
New Revision: 1023104

URL: http://svn.apache.org/viewvc?rev=1023104&view=rev
Log:
Fix authz_tests 19, which is failing for svn and http checkouts,
by removing incomplete entries from revision control upon revert.

 * subversion/libsvn_wc/adm_ops.c
   (revert_internal): Quick-fail on reverting 'incomplete' entries by
     removing them from version control.

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

Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1023104&r1=1023103&r2=1023104&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Fri Oct 15 20:44:12 2010
@@ -1369,6 +1369,15 @@ revert_internal(svn_wc__db_t *db,
         case svn_wc__db_status_excluded:
           unversioned = TRUE;
           break;
+        case svn_wc__db_status_incomplete:
+          /* Remove NAME from PATH's entries file
+
+             Not being able to revert incomplete entries breaks working
+             copies flat out, but the usual revert process can't be
+             applied.  Most preconditions aren't met. */
+          SVN_ERR(svn_wc__db_temp_op_remove_entry(db, local_abspath, pool));
+          return SVN_NO_ERROR;
+          break;
         default:
           unversioned = FALSE;
           break;


Reply via email to