svn commit: r1819915 - in /subversion/branches/better-pristines/subversion: include/private/svn_wc_private.h include/svn_client.h libsvn_wc/upgrade.c

[br...@apache.org]

Author: brane
Date: Tue Jan  2 23:53:19 2018
New Revision: 1819915

URL: http://svn.apache.org/viewvc?rev=1819915&view=rev
Log:
On the better-pristines branch: Update API version annotations.

With trunk becoming 1.11.0-dev, the annotations on changed APIs must
reflect that version bump.

* subversion/include/private/svn_wc_private.h
  (svn_wc__format_from_version, svn_wc__upgrade): Update docstrings.
* subversion/include/svn_client.h
  (svn_client_checkout4, svn_client_checkout3,
   svn_client_upgrade2, svn_client_upgrade): Update docstrings.

* subversion/libsvn_wc/upgrade.c
  (svn_wc__version_string_from_format): Format 32 belongs to 1.11, not 1.10.

Modified:
    subversion/branches/better-pristines/subversion/include/private/svn_wc_private.h
    subversion/branches/better-pristines/subversion/include/svn_client.h
    subversion/branches/better-pristines/subversion/libsvn_wc/upgrade.c

Modified: subversion/branches/better-pristines/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/better-pristines/subversion/include/private/svn_wc_private.h?rev=1819915&r1=1819914&r2=1819915&view=diff
==============================================================================
--- subversion/branches/better-pristines/subversion/include/private/svn_wc_private.h (original)
+++ subversion/branches/better-pristines/subversion/include/private/svn_wc_private.h Tue Jan  2 23:53:19 2018
@@ -2093,7 +2093,7 @@ svn_wc__translated_stream(svn_stream_t *
  *
  * Use @a scratch_pool for temporary allocations.
  *
- * @since New in 1.10.
+ * @since New in 1.11.
  */
 svn_error_t *
 svn_wc__format_from_version(int *format,
@@ -2118,7 +2118,7 @@ svn_wc__format_from_version(int *format,
  * repository uuid, @a repos_info_func (if non-NULL) will be called
  * with @a repos_info_baton to provide the missing information.
  *
- * @since New in 1.10.
+ * @since New in 1.11.
  */
 svn_error_t *
 svn_wc__upgrade(svn_wc_context_t *wc_ctx,

Modified: subversion/branches/better-pristines/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/branches/better-pristines/subversion/include/svn_client.h?rev=1819915&r1=1819914&r2=1819915&view=diff
==============================================================================
--- subversion/branches/better-pristines/subversion/include/svn_client.h (original)
+++ subversion/branches/better-pristines/subversion/include/svn_client.h Tue Jan  2 23:53:19 2018
@@ -1221,7 +1221,7 @@ svn_client_args_to_target_array(apr_arra
  *         #svn_opt_revision_date. <br>
  *         If no error occurred, return #SVN_NO_ERROR.
  *
- * @since New in 1.10.
+ * @since New in 1.11.
  *
  * @see #svn_depth_t <br> #svn_client_ctx_t <br> @ref clnt_revisions for
  *      a discussion of operative and peg revisions.
@@ -1243,8 +1243,8 @@ svn_client_checkout4(svn_revnum_t *resul
  * Similar to svn_client_checkout4() but always creates the newest
  * supported working copy format.
  *
- * @since New in 1.5
- * @deprecated Provided for backward compatibility with the 1.9 API.
+ * @since New in 1.5.
+ * @deprecated Provided for backward compatibility with the 1.10 API.
  */
 SVN_DEPRECATED
 svn_error_t *
@@ -4238,7 +4238,7 @@ svn_client_cleanup(const char *dir,
  *
  * Use @a scratch_pool for any temporary allocations.
  *
- * @since New in 1.10.
+ * @since New in 1.11.
  */
 svn_error_t *
 svn_client_upgrade2(const char *wcroot_dir,
@@ -4250,8 +4250,8 @@ svn_client_upgrade2(const char *wcroot_d
  * Like svn_client_upgrade2(), but always upgrades to the newest
  * supported format.
  *
- * @since New in 1.7
- * @deprecated Provided for backward compatibility with the 1.9 API.
+ * @since New in 1.7.
+ * @deprecated Provided for backward compatibility with the 1.10 API.
  */
 SVN_DEPRECATED
 svn_error_t *

Modified: subversion/branches/better-pristines/subversion/libsvn_wc/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/branches/better-pristines/subversion/libsvn_wc/upgrade.c?rev=1819915&r1=1819914&r2=1819915&view=diff
==============================================================================
--- subversion/branches/better-pristines/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/branches/better-pristines/subversion/libsvn_wc/upgrade.c Tue Jan  2 23:53:19 2018
@@ -1636,7 +1636,7 @@ svn_wc__version_string_from_format(int w
       case SVN_WC__WC_NG_VERSION: return "1.7";
       case 29: return "1.7";
       case 31: return "1.8";
-      case 32: return "1.10";
+      case 32: return "1.11";
     }
   return _("(unreleased development version)");
 }