subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1537066 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Date Wed, 30 Oct 2013 12:40:46 GMT
Author: rhuijben
Date: Wed Oct 30 12:40:46 2013
New Revision: 1537066

URL: http://svn.apache.org/r1537066
Log:
* subversion/libsvn_wc/wc_db.c
  (bump_node_revision): Following up on r1537065, remove now duplicated
    handling of not present and server excluded nodes.

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=1537066&r1=1537065&r2=1537066&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Oct 30 12:40:46 2013
@@ -11232,23 +11232,6 @@ bump_node_revision(svn_wc__db_wcroot_t *
                                             wcroot, local_relpath,
                                             scratch_pool, scratch_pool));
 
-  /* If the node is still marked 'not-present', then the server did not
-     re-add it.  So it's really gone in this revision, thus we remove the node.
-
-     If the node is still marked 'server-excluded' and yet is not the same
-     revision as new_rev, then the server did not re-add it, nor
-     re-server-exclude it, so we can remove the node. */
-  if (!is_root
-      && (status == svn_wc__db_status_not_present
-          || (status == svn_wc__db_status_server_excluded &&
-              revision != new_rev)))
-    {
-      return svn_error_trace(db_base_remove(wcroot, local_relpath,
-                                            db, FALSE, FALSE, FALSE,
-                                            SVN_INVALID_REVNUM,
-                                            NULL, NULL, scratch_pool));
-    }
-
   if (new_repos_relpath != NULL && strcmp(repos_relpath, new_repos_relpath))
     set_repos_relpath = TRUE;
 



Mime
View raw message