svn commit: r1100380 - /subversion/trunk/subversion/libsvn_wc/wc_db.h

[rh...@apache.org]

Author: rhuijben
Date: Fri May  6 21:17:45 2011
New Revision: 1100380

URL: http://svn.apache.org/viewvc?rev=1100380&view=rev
Log:
* subversion/libsvn_wc/wc_db.h
  (svn_wc__db_temp_op_set_new_dir_to_incomplete): Remove reference to a tree
    conflict from the function description. This function is used for every
    added directory in the update editor without notion of a tree conflict.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db.h

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1100380&r1=1100379&r2=1100380&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Fri May  6 21:17:45 2011
@@ -2659,15 +2659,10 @@ svn_wc__db_temp_op_set_property_conflict
                                                      const char *prej_abspath,
                                                      apr_pool_t *scratch_pool);
 
-/* Tweak a locally added existing directory LOCAL_ABSPATH to have a base
-   node with incomplete status and revision REVISION instead. If
-   REPOS_RELPATH is not NULL, apply REPOS_RELPATH, REPOS_ROOT_URL and
-   REPOS_UUID.
+/* Add a new directory in BASE, whether WORKING nodes exist or not. Mark it
+   as incomplete and with revision REVISION. If REPOS_RELPATH is not NULL,
+   apply REPOS_RELPATH, REPOS_ROOT_URL and REPOS_UUID.
    Perform all temporary allocations in SCRATCH_POOL.
-
-   ### For 1.7 this should probably become a proper tree conflict and
-   ### just handled by putting a base directory below the existing
-   ### working node.
    */
 svn_error_t *
 svn_wc__db_temp_op_set_new_dir_to_incomplete(svn_wc__db_t *db,