svn commit: r1931327 - in subversion/branches/better-pristines: . subversion/libsvn_client

Author: brane
Date: Wed Jan 14 20:15:20 2026
New Revision: 1931327

Log:
On the better-pristines branch: Sync with trunk to r1931325.

Modified:
   subversion/branches/better-pristines/   (props changed)
   subversion/branches/better-pristines/subversion/libsvn_client/upgrade.c

Modified: subversion/branches/better-pristines/subversion/libsvn_client/upgrade.c
==============================================================================
--- subversion/branches/better-pristines/subversion/libsvn_client/upgrade.c	Wed Jan 14 20:10:02 2026	(r1931326)
+++ subversion/branches/better-pristines/subversion/libsvn_client/upgrade.c	Wed Jan 14 20:15:20 2026	(r1931327)
@@ -254,10 +254,11 @@ svn_client_wc_version_from_format(int wc
   const svn_wc__version_info_t *const version_info =
     svn_wc__version_info_from_format(wc_format);
 
-  if (version_info->text != NULL)
-    return &version_info->version;
+  /* NOTE: This can be the "null" version "0.0.0" and that's an
+           unrecoverable programming error. */
+  SVN_ERR_ASSERT_NO_RETURN(version_info->text != NULL);
 
-  return NULL;
+  return &version_info->version;
 }
 
 const int *
@@ -279,8 +280,7 @@ svn_client_oldest_wc_version(apr_pool_t
   const svn_wc__version_info_t *const version_info =
     svn_wc__version_info_from_format(SVN_WC__SUPPORTED_VERSION);
 
-  /* NOTE: This can be the "null" version "0.0.0" and that's an
-           unrecoverable programming error. */
+  /* See note in svn_client_wc_version_from_format(), above. */
   SVN_ERR_ASSERT_NO_RETURN(version_info->text != NULL);
 
   return &version_info->version;
@@ -316,7 +316,7 @@ svn_client_default_wc_version(const svn_
       const svn_wc__version_info_t *const version_info =
         svn_wc__version_info_from_format(SVN_WC__SUPPORTED_VERSION);
 
-      /* See note in svn_client_oldest_wc_version(), above. */
+      /* See note in svn_client_wc_version_from_format(), above. */
       SVN_ERR_ASSERT(version_info->text != NULL);
 
       version = &version_info->version;
@@ -332,7 +332,7 @@ svn_client_latest_wc_version(apr_pool_t
   const svn_wc__version_info_t *const version_info =
     svn_wc__version_info_from_format(SVN_WC__VERSION);
 
-  /* See note in svn_client_oldest_wc_version(), above. */
+  /* See note in svn_client_wc_version_from_format(), above. */
   SVN_ERR_ASSERT_NO_RETURN(version_info->text != NULL);
 
   return &version_info->version;
@@ -344,7 +344,7 @@ svn_client__compatible_wc_version_option
   const svn_wc__version_info_t *const version_info =
     svn_wc__version_info_from_format(SVN_WC__HAS_OPTIONAL_PRISTINE);
 
-  /* See note in svn_client_oldest_wc_version(), above. */
+  /* See note in svn_client_wc_version_from_format(), above. */
   SVN_ERR_ASSERT_NO_RETURN(version_info->text != NULL);
 
   return &version_info->version;