svn commit: r1412670 - /subversion/trunk/subversion/include/svn_wc.h

[ju...@apache.org]

Author: julianfoad
Date: Thu Nov 22 20:48:05 2012
New Revision: 1412670

URL: http://svn.apache.org/viewvc?rev=1412670&view=rev
Log:
* subversion/include/svn_wc.h
  (svn_wc_is_wc_root2): Tweak the doc string of this deprecated function,
    and move it down below its replacement, following r1412651.

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

Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1412670&r1=1412669&r2=1412670&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Thu Nov 22 20:48:05 2012
@@ -5403,31 +5403,6 @@ svn_wc_crawl_revisions(const char *path,
  * @{
  */
 
-/** Set @a *wc_root to @c TRUE if @a local_abspath represents a "working copy
- * root", @c FALSE otherwise. Here, @a local_abspath is a "working copy root"
- * if its parent directory is not a WC or if its parent directory's repository
- * URL is not the parent of its own repository URL. Thus, a switched subtree is
- * considered to be a working copy root. Also, a deleted tree-conflict
- * victim is considered a "working copy root" because it has no URL.
- *
- * If @a local_abspath is not found, return the error #SVN_ERR_ENTRY_NOT_FOUND.
- *
- * Use @a scratch_pool for any temporary allocations.
- *
- * For legacy reasons only directories can be a wc-root.
- * svn_wc_is_root_or_switched() also sets wc_root to @c TRUE for switched
- * files.
- *
- * @since New in 1.7.
- * @deprecated Provided for backward compatibility with the 1.7 API.
- */
-SVN_DEPRECATED svn_error_t *
-svn_wc_is_wc_root2(svn_boolean_t *wc_root,
-                   svn_wc_context_t *wc_ctx,
-                   const char *local_abspath,
-                   apr_pool_t *scratch_pool);
-
-
 /** If @a is_wcroot is not @c NULL, set @a *is_wcroot to @c TRUE if @a
  * local_abspath is the root of the working, otherwise to @c FALSE.
  *
@@ -5450,6 +5425,30 @@ svn_wc_check_root(svn_boolean_t *is_wcro
                   const char *local_abspath,
                   apr_pool_t *scratch_pool);
 
+/** Set @a *wc_root to @c TRUE if @a local_abspath represents a "working copy
+ * root", @c FALSE otherwise. Here, @a local_abspath is a "working copy root"
+ * if its parent directory is not a WC or if it is switched. Also, a deleted
+ * tree-conflict victim is considered a "working copy root" because it has no
+ * URL.
+ *
+ * If @a local_abspath is not found, return the error #SVN_ERR_ENTRY_NOT_FOUND.
+ *
+ * Use @a scratch_pool for any temporary allocations.
+ *
+ * @note For legacy reasons only a directory can be a wc-root. However, this
+ * function will also set wc_root to @c TRUE for a switched file.
+ *
+ * @since New in 1.7.
+ * @deprecated Provided for backward compatibility with the 1.7 API. Consider
+ * using svn_wc_check_root() instead.
+ */
+SVN_DEPRECATED svn_error_t *
+svn_wc_is_wc_root2(svn_boolean_t *wc_root,
+                   svn_wc_context_t *wc_ctx,
+                   const char *local_abspath,
+                   apr_pool_t *scratch_pool);
+
+
 /**
  * Similar to svn_wc_is_wc_root2(), but with an access baton and relative
  * path.