subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1764449 - /subversion/trunk/subversion/libsvn_wc/crop.c
Date Wed, 12 Oct 2016 12:43:36 GMT
Author: rhuijben
Date: Wed Oct 12 12:43:36 2016
New Revision: 1764449

URL: http://svn.apache.org/viewvc?rev=1764449&view=rev
Log:
Add a note to the working copy crop function about issue #4636.

* subversion/libsvn_wc/crop.c
  (crop_children): Add comment.

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

Modified: subversion/trunk/subversion/libsvn_wc/crop.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/crop.c?rev=1764449&r1=1764448&r2=1764449&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/crop.c (original)
+++ subversion/trunk/subversion/libsvn_wc/crop.c Wed Oct 12 12:43:36 2016
@@ -106,7 +106,12 @@ crop_children(svn_wc__db_t *db,
           svn_boolean_t modified, all_deletes;
 
           if (child_status != svn_wc__db_status_deleted)
-            continue; /* Leave local additions alone */
+            {
+              /* ### TODO: Check for issue #4636 constraints, but not only on
+                     this node, but also at all its descendants: We don't want
+                     to remove moved_from information here! */
+              continue; /* Leave local additions alone */
+            }
 
           SVN_ERR(svn_wc__node_has_local_mods(&modified, &all_deletes,
                                               db, child_abspath, FALSE,



Mime
View raw message