subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1842447 - in /subversion/branches/better-pristines/subversion: include/ include/private/ libsvn_wc/ svn/ tests/cmdline/getopt_tests_data/
Date Mon, 01 Oct 2018 09:57:44 GMT
Author: brane
Date: Mon Oct  1 09:57:44 2018
New Revision: 1842447

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

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/include/svn_version.h
    subversion/branches/better-pristines/subversion/include/svn_wc.h
    subversion/branches/better-pristines/subversion/libsvn_wc/upgrade.c
    subversion/branches/better-pristines/subversion/svn/svn.c
    subversion/branches/better-pristines/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
    subversion/branches/better-pristines/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout

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=1842447&r1=1842446&r2=1842447&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 Mon Oct
 1 09:57:44 2018
@@ -2117,7 +2117,7 @@ svn_wc__translated_stream(svn_stream_t *
  *
  * Use @a scratch_pool for temporary allocations.
  *
- * @since New in 1.11.
+ * @since New in 1.12.
  */
 svn_error_t *
 svn_wc__format_from_version(int *format,
@@ -2142,7 +2142,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.11.
+ * @since New in 1.12.
  */
 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=1842447&r1=1842446&r2=1842447&view=diff
==============================================================================
--- subversion/branches/better-pristines/subversion/include/svn_client.h (original)
+++ subversion/branches/better-pristines/subversion/include/svn_client.h Mon Oct  1 09:57:44
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.11.
+ * @since New in 1.12.
  *
  * @see #svn_depth_t <br> #svn_client_ctx_t <br> @ref clnt_revisions for
  *      a discussion of operative and peg revisions.
@@ -4338,7 +4338,7 @@ svn_client_cleanup(const char *dir,
  *
  * Use @a scratch_pool for any temporary allocations.
  *
- * @since New in 1.11.
+ * @since New in 1.12.
  */
 svn_error_t *
 svn_client_upgrade2(const char *wcroot_dir,
@@ -4351,7 +4351,7 @@ svn_client_upgrade2(const char *wcroot_d
  * supported format.
  *
  * @since New in 1.7.
- * @deprecated Provided for backward compatibility with the 1.10 API.
+ * @deprecated Provided for backward compatibility with the 1.11 API.
  */
 SVN_DEPRECATED
 svn_error_t *
@@ -4362,6 +4362,8 @@ svn_client_upgrade(const char *wcroot_di
 /**
  * Returns the version related to the earliest supported
  * working copy metadata format.
+ *
+ * @since New in 1.12.
  */
 const svn_version_t *
 svn_client_supported_wc_version(void);

Modified: subversion/branches/better-pristines/subversion/include/svn_version.h
URL: http://svn.apache.org/viewvc/subversion/branches/better-pristines/subversion/include/svn_version.h?rev=1842447&r1=1842446&r2=1842447&view=diff
==============================================================================
--- subversion/branches/better-pristines/subversion/include/svn_version.h (original)
+++ subversion/branches/better-pristines/subversion/include/svn_version.h Mon Oct  1 09:57:44
2018
@@ -133,6 +133,7 @@ extern "C" {
 /** Complete version string */
 #define SVN_VERSION        SVN_VER_NUMBER SVN_VER_TAG
 
+
 
 /* Version queries and compatibility checks */
 

Modified: subversion/branches/better-pristines/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/branches/better-pristines/subversion/include/svn_wc.h?rev=1842447&r1=1842446&r2=1842447&view=diff
==============================================================================
--- subversion/branches/better-pristines/subversion/include/svn_wc.h (original)
+++ subversion/branches/better-pristines/subversion/include/svn_wc.h Mon Oct  1 09:57:44 2018
@@ -7448,7 +7448,7 @@ typedef svn_error_t * (*svn_wc_upgrade_g
  * with @a repos_info_baton to provide the missing information.
  *
  * @since New in 1.7
- * @deprecated Provided for backward compatibility with the 1.9 API.
+ * @deprecated Provided for backward compatibility with the 1.11 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=1842447&r1=1842446&r2=1842447&view=diff
==============================================================================
--- subversion/branches/better-pristines/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/branches/better-pristines/subversion/libsvn_wc/upgrade.c Mon Oct  1 09:57:44
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.11";
+      case 32: return "1.12";
     }
   return _("(unreleased development version)");
 }
@@ -1662,18 +1662,19 @@ svn_wc__format_from_version(int *format,
 
   switch (version->minor)
     {
-      case 0: /* Same as 1.3.x. */
-      case 1: /* Same as 1.3.x. */
-      case 2: /* Same as 1.3.x. */
-      case 3: *format = 4; break;
-      case 4: *format = 8; break;
-      case 5: *format = 9; break;
-      case 6: *format = 10; break;
-      case 7: *format = 29; break;
-      case 8: /* Same as 1.10.x. */
-      case 9: /* Same as 1.10.x. */
-      case 10: *format = 31; break;
-      case 11: /* Same as the current version. */
+      case 0:  /* Same as 1.3.x. */
+      case 1:  /* Same as 1.3.x. */
+      case 2:  /* Same as 1.3.x. */
+      case 3:  *format = 4; break;
+      case 4:  *format = 8; break;
+      case 5:  *format = 9; break;
+      case 6:  *format = 10; break;
+      case 7:  *format = 29; break;
+      case 8:  /* Same as 1.11.x. */
+      case 9:  /* Same as 1.11.x. */
+      case 10: /* Same as 1.11.x. */
+      case 11: *format = 31; break;
+      case 12: /* Same as the current version. */
       default: *format = SVN_WC__VERSION; break;
     }
 

Modified: subversion/branches/better-pristines/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/better-pristines/subversion/svn/svn.c?rev=1842447&r1=1842446&r2=1842447&view=diff
==============================================================================
--- subversion/branches/better-pristines/subversion/svn/svn.c (original)
+++ subversion/branches/better-pristines/subversion/svn/svn.c Mon Oct  1 09:57:44 2018
@@ -479,7 +479,7 @@ const apr_getopt_option_t svn_cl__option
                        N_("remove unreferenced pristines from .svn directory")},
 
   {"drop", opt_drop, 0,
-   N_("drop shelf after successful unshelve")},
+                       N_("drop shelf after successful unshelve")},
 
   {"x-viewspec", opt_viewspec, 1,
                        N_("print the working copy layout, formatted according\n"

Modified: subversion/branches/better-pristines/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
URL: http://svn.apache.org/viewvc/subversion/branches/better-pristines/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout?rev=1842447&r1=1842446&r2=1842447&view=diff
==============================================================================
--- subversion/branches/better-pristines/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
(original)
+++ subversion/branches/better-pristines/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
Mon Oct  1 09:57:44 2018
@@ -6,7 +6,7 @@ This software consists of contributions
 see the NOTICE file for more information.
 Subversion is open source software, see http://subversion.apache.org/
 
-Supported working copy (WC) versions: from 1.8 to 1.11
+Supported working copy (WC) versions: from 1.8 to 1.12
 
 The following repository access (RA) modules are available:
 

Modified: subversion/branches/better-pristines/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
URL: http://svn.apache.org/viewvc/subversion/branches/better-pristines/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout?rev=1842447&r1=1842446&r2=1842447&view=diff
==============================================================================
--- subversion/branches/better-pristines/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
(original)
+++ subversion/branches/better-pristines/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
Mon Oct  1 09:57:44 2018
@@ -6,7 +6,7 @@ This software consists of contributions
 see the NOTICE file for more information.
 Subversion is open source software, see http://subversion.apache.org/
 
-Supported working copy (WC) versions: from 1.8 to 1.11
+Supported working copy (WC) versions: from 1.8 to 1.12
 
 The following repository access (RA) modules are available:
 



Mime
View raw message