Author: danielsh Date: Thu Mar 17 21:31:27 2022 New Revision: 1899009 URL: http://svn.apache.org/viewvc?rev=1899009&view=rev Log: On the pristines-on-demand-on-mwf branch, sync with trunk@r1899007. No functional change.
Modified: subversion/branches/pristines-on-demand-on-mwf/ (props changed) subversion/branches/pristines-on-demand-on-mwf/subversion/include/private/svn_wc_private.h subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_client.h subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc-metadata.sql subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc.h Propchange: subversion/branches/pristines-on-demand-on-mwf/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1898850-1898998,1899000-1899007 Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/include/private/svn_wc_private.h URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/include/private/svn_wc_private.h?rev=1899009&r1=1899008&r2=1899009&view=diff ============================================================================== --- subversion/branches/pristines-on-demand-on-mwf/subversion/include/private/svn_wc_private.h (original) +++ subversion/branches/pristines-on-demand-on-mwf/subversion/include/private/svn_wc_private.h Thu Mar 17 21:31:27 2022 @@ -2180,7 +2180,7 @@ svn_wc__working_file_writer_close(svn_wc /** - * Convert @a version to that version's characteristic working copy + * Convert @a version to that version's newest working copy * format, returned in @a format. * * A NULL @a version translates to the library's default version. Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_client.h URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_client.h?rev=1899009&r1=1899008&r2=1899009&view=diff ============================================================================== --- subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_client.h (original) +++ subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_client.h Thu Mar 17 21:31:27 2022 @@ -1240,10 +1240,10 @@ svn_client_args_to_target_array(apr_arra * set equal to the base properties. <br> * If @c FALSE, then abort if there are any unversioned * obstructing items. - * @param[in] wc_format_version is the version number of the Subversion - * client that supports the metadata format of the - * created working copy; @c NULL means the library's default - * format. See svn_client_default_wc_version(), + * @param[in] wc_format_version is the version number of the oldest Subversion + * client with which the created working copy should be compatible; + * @c NULL means the library's version. + * See svn_client_default_wc_version(), * svn_client_get_wc_formats_supported(). * @param[in] ctx The standard client context, used for authentication and * notification. @@ -4396,12 +4396,14 @@ svn_client_cleanup(const char *dir, /** * Recursively upgrade a working copy and nested externals working - * copies from any older format to the given WC metadata storage - * format. @a wcroot_dir is the path to the WC root. + * copies from any older format to a WC metadata storage + * format supported by Subversion @a wc_format_version. * - * @a wc_format_version is the version number of the Subversion client - * that supports a given WC metadata format; @c NULL means the library's - * default format. See svn_client_default_wc_version(), + * If @a wc_format_version is @c NULL, the library's version is used. + * + * @a wcroot_dir is the path to the WC root. + * + * @see svn_client_default_wc_version(), * svn_client_get_wc_formats_supported(). * * Use @a scratch_pool for any temporary allocations. Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc-metadata.sql URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc-metadata.sql?rev=1899009&r1=1899008&r2=1899009&view=diff ============================================================================== --- subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc-metadata.sql (original) +++ subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc-metadata.sql Thu Mar 17 21:31:27 2022 @@ -791,6 +791,10 @@ PRAGMA user_version = 33; */ * * subversion/tests/libsvn_wc/wc-queries-test.c * (schema_statements, create_memory_db) * * The implementation of svn_client_latest_wc_version() + * * The implementation of svn_wc__format_from_version() + * * The implementation of svn_client_get_wc_formats_supported() + * * The comment above the comment above SVN_WC__VERSION + * * The value of SVN_WC__VERSION, if needed */ Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc.h URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc.h?rev=1899009&r1=1899008&r2=1899009&view=diff ============================================================================== --- subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc.h (original) +++ subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc.h Thu Mar 17 21:31:27 2022 @@ -170,11 +170,17 @@ extern "C" { * Please document any further format changes here. */ -/* The default WC version created by the client. */ +/* The newest WC format this client supports. + * + * @see svn_wc__max_supported_format() + */ #define SVN_WC__VERSION 32 /* The minimum WC version supported by the client. - IMPORTANT: Update the implementation of svn_client_default_wc_version() + * + * @see svn_wc__min_supported_format() + */ +/* IMPORTANT: Update the implementation of svn_client_default_wc_version() and svn_client_get_wc_formats_supported() whenever you change this value! */ #define SVN_WC__SUPPORTED_VERSION 31