Re: svn commit: r1905663 - in /subversion/branches/pristines-on-demand-on-mwf/subversion: include/ include/private/ libsvn_client/ libsvn_wc/
Daniel Sahlberg writes: >> + /** @since New in 1.15 */ >> + SVN_ERRDEF(SVN_ERR_WC_DEPRECATED_API_STORE_PRISTINE, >> + SVN_ERR_WC_CATEGORY_START + 43, >> + "This client was not updated to support working copies " >> + "without local pristines") >> + >>/* fs errors */ > > Is it really "This client"? It looks more to be based on the WC setting. This new error should only occur when someone (a 3rd party client) uses the deprecated API function for a working copy without pristines. >From that point of view, I would say that the problem is in the client that is still using the deprecated API and thus cannot properly handle such working copies. Also, the current message aims to be somewhat consistent with another existing error for a case when a client is too old to read a newer working copy format: "This client is too old to work with the working copy […] (format 32)" (After writing this, I realized that the "was not updated" part of the message may be misinterpreted as a requirement to update to the newer version of the software. In r1905682, I slightly rephrased that part so that it would say: "This client uses a deprecated API that does not support working copies without local pristines") Thanks, Evgeny Kotkov
svn commit: r1905682 - /subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_error_codes.h
Author: kotkov Date: Thu Dec 1 19:03:31 2022 New Revision: 1905682 URL: http://svn.apache.org/viewvc?rev=1905682=rev Log: On the 'pristines-on-demand-on-mwf' branch: Slightly rephrase an error message. The previous message could potentially be misinterpreted as a requirement to update to a newer version of the software. * subversion/include/svn_error_codes.h (SVN_ERR_WC_DEPRECATED_API_STORE_PRISTINE): Tweak the error message. Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_error_codes.h Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_error_codes.h URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_error_codes.h?rev=1905682=1905681=1905682=diff == --- subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_error_codes.h (original) +++ subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_error_codes.h Thu Dec 1 19:03:31 2022 @@ -584,8 +584,8 @@ SVN_ERROR_START /** @since New in 1.15 */ SVN_ERRDEF(SVN_ERR_WC_DEPRECATED_API_STORE_PRISTINE, SVN_ERR_WC_CATEGORY_START + 43, - "This client was not updated to support working copies " - "without local pristines") + "This client uses a deprecated API that does not support " + "working copies without local pristines") /* fs errors */
Re: svn commit: r1905663 - in /subversion/branches/pristines-on-demand-on-mwf/subversion: include/ include/private/ libsvn_client/ libsvn_wc/
Den tors 1 dec. 2022 kl 11:42 skrev : > Author: kotkov > Date: Thu Dec 1 10:42:41 2022 > New Revision: 1905663 > [...] > Modified: > subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_error_codes.h > URL: > http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_error_codes.h?rev=1905663=1905662=1905663=diff > > == > --- > subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_error_codes.h > (original) > +++ > subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_error_codes.h > Thu Dec 1 10:42:41 2022 > @@ -581,6 +581,12 @@ SVN_ERROR_START > SVN_ERR_WC_CATEGORY_START + 42, > "Incompatible working copy settings") > > + /** @since New in 1.15 */ > + SVN_ERRDEF(SVN_ERR_WC_DEPRECATED_API_STORE_PRISTINE, > + SVN_ERR_WC_CATEGORY_START + 43, > + "This client was not updated to support working copies " > + "without local pristines") > + >/* fs errors */ > Is it really "This client"? It looks more to be based on the WC setting. Kind regards, /Daniel
svn commit: r1905665 - /subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h
Author: kotkov Date: Thu Dec 1 10:49:19 2022 New Revision: 1905665 URL: http://svn.apache.org/viewvc?rev=1905665=rev Log: On the 'pristines-on-demand-on-mwf' branch: Following up on r1905662, fix an invalid @see reference in a docstring. No functional changes. * subversion/include/svn_wc.h (svn_wc_textbase_sync): Refer to svn_wc_textbase_fetch_cb_t. Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h?rev=1905665=1905664=1905665=diff == --- subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h (original) +++ subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h Thu Dec 1 10:49:19 2022 @@ -7516,7 +7516,7 @@ typedef svn_error_t *(*svn_wc_textbase_f * If @a allow_dehydrate is true, remove the on disk text-base contents * that is not required. * - * @see svn_wc_textbase_hydrate_cb_t + * @see svn_wc_textbase_fetch_cb_t * @see svn_client__textbase_sync for usage/implementation example. * * @since New in 1.15.
svn commit: r1905664 - /subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h
Author: kotkov Date: Thu Dec 1 10:44:28 2022 New Revision: 1905664 URL: http://svn.apache.org/viewvc?rev=1905664=rev Log: On the 'pristines-on-demand-on-mwf' branch: Following up on r1905662, fix invalid indentation in a docstring. No functional changes. * subversion/include/svn_wc.h (svn_wc_textbase_sync): Fix indentation in a docstring. Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h?rev=1905664=1905663=1905664=diff == --- subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h (original) +++ subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h Thu Dec 1 10:44:28 2022 @@ -7505,22 +7505,22 @@ typedef svn_error_t *(*svn_wc_textbase_f void *cancel_baton, apr_pool_t *scratch_pool); - /** Synchronize the state of the text-base contents for the - * @a local_abspath tree. - * - * If @a allow_hydrate is true, fetch the required but missing text-base - * contents using the provided @a fetch_callback and @a fetch_baton. - * If @a allow_hydrate is false, @a fetch_callback will not be used and - * may be @c NULL. - * - * If @a allow_dehydrate is true, remove the on disk text-base contents - * that is not required. - * - * @see svn_wc_textbase_hydrate_cb_t - * @see svn_client__textbase_sync for usage/implementation example. - * - * @since New in 1.15. - */ +/** Synchronize the state of the text-base contents for the + * @a local_abspath tree. + * + * If @a allow_hydrate is true, fetch the required but missing text-base + * contents using the provided @a fetch_callback and @a fetch_baton. + * If @a allow_hydrate is false, @a fetch_callback will not be used and + * may be @c NULL. + * + * If @a allow_dehydrate is true, remove the on disk text-base contents + * that is not required. + * + * @see svn_wc_textbase_hydrate_cb_t + * @see svn_client__textbase_sync for usage/implementation example. + * + * @since New in 1.15. + */ svn_error_t * svn_wc_textbase_sync(svn_wc_context_t *wc_ctx, const char *local_abspath,
svn commit: r1905663 - in /subversion/branches/pristines-on-demand-on-mwf/subversion: include/ include/private/ libsvn_client/ libsvn_wc/
Author: kotkov Date: Thu Dec 1 10:42:41 2022 New Revision: 1905663 URL: http://svn.apache.org/viewvc?rev=1905663=rev Log: On the 'pristines-on-demand-on-mwf' branch: Bump libsvn_wc APIs that may need to access pristine contents and adjust their deprecated versions so that they would return an error for working copies without pristines. Additionally, change the existing deprecated function that may need to access pristines so that they would also return an error in such cases. With this change, the deprecated functions will fail predictably — instead of only failing on attempts to read a pristine that was not fetched during any of the previous API calls. * subversion/include/svn_error_codes.h (SVN_ERR_WC_DEPRECATED_API_STORE_PRISTINE): New error code. * subversion/include/svn_wc.h (svn_wc_crawl_revisions6): New, revved from … (svn_wc_crawl_revisions5): …this function, which is now deprecated. (svn_wc_diff7): New, revved from … (svn_wc_diff6): …this function, which is now deprecated. (svn_wc_merge6): New, revved from … (svn_wc_merge5): …this function, which is now deprecated. (svn_wc_get_pristine_contents3): New, revved from … (svn_wc_get_pristine_contents2): …this function, which is now deprecated. (svn_wc_revert7): New, revved from … (svn_wc_revert6): …this function, which is now deprecated. (svn_wc_restore2): New, revved from … (svn_wc_restore): …this function, which is now deprecated. (svn_wc_transmit_text_deltas4): New, revved from … (svn_wc_transmit_text_deltas3): …this function, which is now deprecated. * subversion/libsvn_wc/deprecated.c (svn_wc_crawl_revisions5, svn_wc_diff6, svn_wc_merge5, svn_wc_get_pristine_contents2, svn_wc_revert6, svn_wc_restore, svn_wc_transmit_text_deltas3): Now reside in this file. Check working copy settings and forward call to the newer version. * subversion/libsvn_wc/adm_crawler.c (svn_wc_restore): Replace with … (svn_wc_restore2): …this new function. (svn_wc_crawl_revisions5): Replace with … (svn_wc_crawl_revisions6): …this new function. (svn_wc_transmit_text_deltas3): Replace with … (svn_wc_transmit_text_deltas4): …this new function. (report_revisions_and_depths): Update comment. * subversion/libsvn_wc/adm_ops.c (svn_wc_get_pristine_copy_path): Make this existing deprecated function return an error for working copies without pristines. (svn_wc_get_pristine_contents2): Replace with … (svn_wc_get_pristine_contents3): …this new function. * subversion/libsvn_wc/conflicts.c (svn_wc_resolved_conflict5): Make this existing deprecated function return an error for working copies without pristines. * subversion/libsvn_wc/diff_local.c (svn_wc_diff6): Replace with … (svn_wc_diff7): …this new function. * subversion/libsvn_wc/externals.c (svn_wc__crawl_file_external): Switch to a newer version of the API. * subversion/libsvn_wc/merge.c (svn_wc_merge5): Replace with … (svn_wc_merge6): …this new function. * subversion/libsvn_wc/revert.c (svn_wc_revert6): Replace with … (svn_wc_revert7): …this new function. * subversion/libsvn_wc/wc.h (svn_wc__internal_merge, svn_wc__internal_transmit_text_deltas): Update docstrings. * subversion/include/private/svn_wc_private.h (svn_wc__get_pristine_contents_by_checksum, svn_wc__get_diff_editor, svn_wc__diff7): Update docstrings. * subversion/libsvn_client/cat.c (svn_client__get_normalized_stream): Switch to a newer version of the API. * subversion/libsvn_client/commit_util.c (svn_client__do_commit): Switch to a newer version of the API. * subversion/libsvn_client/conflicts.c (resolve_merge_incoming_added_file_text_update, resolve_merge_incoming_added_file_text_merge, resolve_merge_incoming_added_file_replace_and_merge, merge_added_files, resolve_update_incoming_added_dir_merge, resolve_incoming_move_file_text_merge, resolve_both_moved_file_text_merge, resolve_both_moved_dir_merge, resolve_both_moved_dir_move_merge, resolve_incoming_move_dir_merge, resolve_local_move_file_merge, resolve_both_moved_file_update_keep_local_move, resolve_both_moved_file_update_keep_incoming_move): Switch to newer versions of the API. * subversion/libsvn_client/diff.c (diff_repos_wc): Switch to a newer version of the API. * subversion/libsvn_client/export.c (export_node): Switch to a newer version of the API. * subversion/libsvn_client/layout.c (svn_client__layout_list): Switch to a newer version of the API. * subversion/libsvn_client/merge.c (merge_file_changed): Switch to a newer version of the API. * subversion/libsvn_client/ra.c (svn_client__ra_provide_base): Switch to a newer version of the API. * subversion/libsvn_client/revert.c (revert): Switch to a newer version of the API. * subversion/libsvn_client/status.c (svn_client_status6): Switch to a newer version of the API. * subversion/libsvn_client/switch.c (switch_internal): Switch to a newer version of the API. *
svn commit: r1905662 - in /subversion/branches/pristines-on-demand-on-mwf/subversion: include/private/svn_wc_private.h include/svn_wc.h libsvn_client/textbase.c libsvn_wc/textbase.c
Author: kotkov Date: Thu Dec 1 10:15:09 2022 New Revision: 1905662 URL: http://svn.apache.org/viewvc?rev=1905662=rev Log: On the 'pristines-on-demand-on-mwf' branch: Expose the working copy text-base sync function as a new public svn_wc API. * subversion/include/private/svn_wc_private.h (svn_wc__textbase_fetch_cb_t, svn_wc__textbase_sync): Promote these private members … * subversion/include/svn_wc.h (svn_wc_textbase_fetch_cb_t, svn_wc_textbase_sync): …into these new APIs. * subversion/libsvn_client/textbase.c (): Adjust includes. (textbase_fetch_cb, svn_client__textbase_sync): Use the new public API. * subversion/libsvn_wc/textbase.c (svn_wc__textbase_sync): Rename to … (svn_wc_textbase_sync): …this. Adjust the type of `fetch_callback`. (textbase_sync_baton_t): Adjust the type of `fetch_callback`. Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/include/private/svn_wc_private.h subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_client/textbase.c subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/textbase.c 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=1905662=1905661=1905662=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 Dec 1 10:15:09 2022 @@ -2321,33 +2321,6 @@ svn_wc__upgrade(svn_wc_context_t *wc_ctx void *notify_baton, apr_pool_t *scratch_pool); -/* The callback invoked by svn_wc__textbase_sync() to fetch the text-base - contents identified by REPOS_ROOT_URL, REPOS_RELPATH and REVISION. */ -typedef svn_error_t *(*svn_wc__textbase_fetch_cb_t)( - void *baton, - const char *repos_root_url, - const char *repos_relpath, - svn_revnum_t revision, - svn_stream_t *contents, - svn_cancel_func_t cancel_func, - void *cancel_baton, - apr_pool_t *scratch_pool); - -/* Synchronize the state of the text-base contents for the LOCAL_ABSPATH tree. - If ALLOW_HYDRATE is true, fetch the required but missing text-base contents - using the provided FETCH_CALLBACK and FETCH_BATON. If ALLOW_DEHYDRATE - is true, remove the on disk text-base contents that is not required. */ -svn_error_t * -svn_wc__textbase_sync(svn_wc_context_t *wc_ctx, - const char *local_abspath, - svn_boolean_t allow_hydrate, - svn_boolean_t allow_dehydrate, - svn_wc__textbase_fetch_cb_t fetch_callback, - void *fetch_baton, - svn_cancel_func_t cancel_func, - void *cancel_baton, - apr_pool_t *scratch_pool); - /* Return the working copy settings *FORMAT_P and *STORE_PRISTINE_P for LOCAL_ABSPATH in WC_CTX. */ svn_error_t * Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h?rev=1905662=1905661=1905662=diff == --- subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h (original) +++ subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_wc.h Thu Dec 1 10:15:09 2022 @@ -7358,6 +7358,51 @@ svn_wc_get_pristine_copy_path(const char apr_pool_t *pool); +/** The callback invoked by svn_wc_textbase_sync() to provide the text-base + * contents identified by @a repos_root_url, @a repos_relpath and @a revision. + * + * The callback is expected to write the contents to @a contents and close + * the stream. + * + * @since New in 1.15. + */ +typedef svn_error_t *(*svn_wc_textbase_fetch_cb_t)( + void *baton, + const char *repos_root_url, + const char *repos_relpath, + svn_revnum_t revision, + svn_stream_t *contents, + svn_cancel_func_t cancel_func, + void *cancel_baton, + apr_pool_t *scratch_pool); + + /** Synchronize the state of the text-base contents for the + * @a local_abspath tree. + * + * If @a allow_hydrate is true, fetch the required but missing text-base + * contents using the provided @a fetch_callback and @a fetch_baton. + * If @a allow_hydrate is false, @a fetch_callback will not be used and + * may be @c NULL. + * + * If @a allow_dehydrate is true, remove the on disk text-base contents + * that is not required. + * + * @see svn_wc_textbase_hydrate_cb_t + * @see svn_client__textbase_sync for usage/implementation example. + * + * @since New
svn commit: r1905659 - in /subversion/branches/pristines-on-demand-on-mwf/subversion: include/private/svn_wc_private.h libsvn_client/textbase.c libsvn_wc/textbase.c libsvn_wc/wc_db.h libsvn_wc/wc_db_t
Author: kotkov
Date: Thu Dec 1 09:57:44 2022
New Revision: 1905659
URL: http://svn.apache.org/viewvc?rev=1905659=rev
Log:
On the 'pristines-on-demand-on-mwf' branch: Rename "hydrate callback" to
a "fetch callback".
Our callbacks currently only fetch the contents, whereas hydrating is a
composite operation that involves fetching the contents *and* marking the
pristine as hydrated in the working copy. So let's use a more appropriate
name for them.
* subversion/include/private/svn_wc_private.h
(svn_wc__textbase_hydrate_cb_t): Rename …
(svn_wc__textbase_fetch_cb_t): …to this.
(svn_wc__textbase_sync): Rename `hydrate_callback` and `hydrate_baton`
to `fetch_callback` and `fetch_baton` respectively.
* subversion/libsvn_client/textbase.c
(textbase_hydrate_baton_t, textbase_hydrate_cb): Rename …
(textbase_fetch_baton_t, textbase_fetch_cb): …to this.
(svn_client__textbase_sync): Use new names. Rename `baton` to `fetch_baton`.
* subversion/libsvn_wc/textbase.c
(textbase_hydrate_cb): Rename …
(textbase_fetch_cb): …to this.
(textbase_sync_baton_t, svn_wc__textbase_sync): Use new names.
* subversion/libsvn_wc/wc_db.h
(svn_wc__db_textbase_hydrate_cb_t): Rename …
(svn_wc__db_textbase_fetch_cb_t): …to this.
(svn_wc__db_textbase_sync): Rename `hydrate_callback` and `hydrate_baton`
to `fetch_callback` and `fetch_baton` respectively.
* subversion/libsvn_wc/wc_db_textbase.c
(textbase_hydrate, svn_wc__db_textbase_sync): Use new names.
Modified:
subversion/branches/pristines-on-demand-on-mwf/subversion/include/private/svn_wc_private.h
subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_client/textbase.c
subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/textbase.c
subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc_db.h
subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc_db_textbase.c
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=1905659=1905658=1905659=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 Dec 1 09:57:44 2022
@@ -2323,7 +2323,7 @@ svn_wc__upgrade(svn_wc_context_t *wc_ctx
/* The callback invoked by svn_wc__textbase_sync() to fetch the text-base
contents identified by REPOS_ROOT_URL, REPOS_RELPATH and REVISION. */
-typedef svn_error_t *(*svn_wc__textbase_hydrate_cb_t)(
+typedef svn_error_t *(*svn_wc__textbase_fetch_cb_t)(
void *baton,
const char *repos_root_url,
const char *repos_relpath,
@@ -2335,15 +2335,15 @@ typedef svn_error_t *(*svn_wc__textbase_
/* Synchronize the state of the text-base contents for the LOCAL_ABSPATH tree.
If ALLOW_HYDRATE is true, fetch the required but missing text-base contents
- using the provided HYDRATE_CALLBACK and HYDRATE_BATON. If ALLOW_DEHYDRATE
+ using the provided FETCH_CALLBACK and FETCH_BATON. If ALLOW_DEHYDRATE
is true, remove the on disk text-base contents that is not required. */
svn_error_t *
svn_wc__textbase_sync(svn_wc_context_t *wc_ctx,
const char *local_abspath,
svn_boolean_t allow_hydrate,
svn_boolean_t allow_dehydrate,
- svn_wc__textbase_hydrate_cb_t hydrate_callback,
- void *hydrate_baton,
+ svn_wc__textbase_fetch_cb_t fetch_callback,
+ void *fetch_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *scratch_pool);
Modified:
subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_client/textbase.c
URL:
http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_client/textbase.c?rev=1905659=1905658=1905659=diff
==
---
subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_client/textbase.c
(original)
+++
subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_client/textbase.c
Thu Dec 1 09:57:44 2022
@@ -27,27 +27,27 @@
#include "client.h"
-/* A baton for use with textbase_hydrate_cb(). */
-typedef struct textbase_hydrate_baton_t
+/* A baton for use with textbase_fetch_cb(). */
+typedef struct textbase_fetch_baton_t
{
apr_pool_t *result_pool;
const char *base_abspath;
svn_client_ctx_t *ctx;
svn_ra_session_t *ra_session;
-} textbase_hydrate_baton_t;
+} textbase_fetch_baton_t;
-/* Implements svn_wc__textbase_hydrate_cb_t. */
+/* Implements svn_wc__textbase_fetch_cb_t. */
static
svn commit: r1905658 - /subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_client/client.h
Author: kotkov Date: Thu Dec 1 09:46:44 2022 New Revision: 1905658 URL: http://svn.apache.org/viewvc?rev=1905658=rev Log: On the 'pristines-on-demand-on-mwf' branch: Fix a docstring. * subversion/libsvn_client/client.h (svn_client__textbase_sync): Don't mention non-existing `hydrate_callback` and `hydrate_baton` parameters. Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_client/client.h Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_client/client.h URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_client/client.h?rev=1905658=1905657=1905658=diff == --- subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_client/client.h (original) +++ subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_client/client.h Thu Dec 1 09:46:44 2022 @@ -1253,9 +1253,9 @@ svn_client__merge_locked(svn_client__con /* Synchronize the state of the text-base contents for the LOCAL_ABSPATH tree. * - * If ALLOW_HYDRATE is true, fetch the required but missing text-base contents - * using the provided HYDRATE_CALLBACK and HYDRATE_BATON. If ALLOW_DEHYDRATE - * is true, remove the on disk text-base contents that are not required. + * If ALLOW_HYDRATE is true, fetch the required but missing text-base contents. + * If ALLOW_DEHYDRATE is true, remove the on disk text-base contents that are + * not required. * * The missing contents will be fetched using the provided RA_SESSION if it * is not NULL. If RA_SESSION is NULL and some of the text-bases have to be
