svn commit: r1455754 - in /subversion/trunk/subversion/include: private/svn_wc_private.h svn_wc.h

[ju...@apache.org]

Author: julianfoad
Date: Tue Mar 12 23:32:57 2013
New Revision: 1455754

URL: http://svn.apache.org/r1455754
Log:
* subversion/include/svn_wc.h
  (svn_wc_get_update_editor4): Document the 'clean_checkout' parameter.

* subversion/include/private/svn_wc_private.h
  (svn_wc__get_update_editor): Same.

Modified:
    subversion/trunk/subversion/include/private/svn_wc_private.h
    subversion/trunk/subversion/include/svn_wc.h

Modified: subversion/trunk/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_wc_private.h?rev=1455754&r1=1455753&r2=1455754&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Tue Mar 12 23:32:57 2013
@@ -1458,6 +1458,10 @@ svn_wc__get_status_editor(const svn_delt
  * the ambient depth filtering, so this doesn't have to be handled in the
  * editor.
  *
+ * If @a clean_checkout is TRUE, assume that we are checking out into an
+ * empty directory, and so bypass a number of conflict checks that are
+ * unnecessary in this case.
+ *
  * If @a fetch_dirents_func is not NULL, the update editor may call this
  * callback, when asked to perform a depth restricted update. It will do this
  * before returning the editor to allow using the primary ra session for this.

Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1455754&r1=1455753&r2=1455754&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Tue Mar 12 23:32:57 2013
@@ -5671,6 +5671,10 @@ typedef svn_error_t *(*svn_wc_dirents_fu
  * the ambient depth filtering, so this doesn't have to be handled in the
  * editor.
  *
+ * If @a clean_checkout is TRUE, assume that we are checking out into an
+ * empty directory, and so bypass a number of conflict checks that are
+ * unnecessary in this case.
+ *
  * If @a fetch_dirents_func is not NULL, the update editor may call this
  * callback, when asked to perform a depth restricted update. It will do this
  * before returning the editor to allow using the primary ra session for this.