subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1661688 - /subversion/trunk/subversion/libsvn_wc/questions.c
Date Mon, 23 Feb 2015 14:42:24 GMT
Author: rhuijben
Date: Mon Feb 23 14:42:24 2015
New Revision: 1661688

URL: http://svn.apache.org/r1661688
Log:
* subversion/libsvn_wc/questions.c
  (modcheck_callback): Following up on r1661682, detect local modifications on
    incomplete nodes (read: directories), instead of reporting them unmodified.

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

Modified: subversion/trunk/subversion/libsvn_wc/questions.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/questions.c?rev=1661688&r1=1661687&r2=1661688&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/questions.c (original)
+++ subversion/trunk/subversion/libsvn_wc/questions.c Mon Feb 23 14:42:24 2015
@@ -615,12 +615,24 @@ modcheck_callback(void *baton,
   switch (status->node_status)
     {
       case svn_wc_status_normal:
-      case svn_wc_status_incomplete:
       case svn_wc_status_ignored:
       case svn_wc_status_none:
       case svn_wc_status_external:
         break;
 
+      case svn_wc_status_incomplete:
+        if ((status->text_status != svn_wc_status_normal
+             && status->text_status != svn_wc_status_none)
+            || (status->prop_status != svn_wc_status_normal
+                && status->prop_status != svn_wc_status_none))
+          {
+            mb->found_mod = TRUE;
+            mb->found_not_delete = TRUE;
+            /* Incomplete, but local modifications */
+            return svn_error_create(SVN_ERR_CEASE_INVOCATION, NULL, NULL);
+          }
+        break;
+
       case svn_wc_status_deleted:
         mb->found_mod = TRUE;
         if (!mb->ignore_unversioned



Mime
View raw message