subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r952728 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Date Tue, 08 Jun 2010 16:37:41 GMT
Author: philip
Date: Tue Jun  8 16:37:40 2010
New Revision: 952728

URL: http://svn.apache.org/viewvc?rev=952728&view=rev
Log:
Allow for SVN_EXPERIMENTAL_COPY which correctly copies excluded
nodes into WORKING_NODE not BASE_NODE.

* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_scan_addition): Allow for excluded in WORKING_NODE.

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=952728&r1=952727&r2=952728&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Jun  8 16:37:40 2010
@@ -5660,8 +5660,8 @@ svn_wc__db_scan_addition(svn_wc__db_stat
       /* Record information from the starting node.  */
       if (current_abspath == local_abspath)
         {
-          /* The starting node should exist normally.  */
-          if (presence != svn_wc__db_status_normal)
+          if (presence != svn_wc__db_status_normal
+              && presence != svn_wc__db_status_excluded)
             return svn_error_createf(SVN_ERR_WC_PATH_UNEXPECTED_STATUS,
                                      svn_sqlite__reset(stmt),
                                      _("Expected node '%s' to be added."),



Mime
View raw message