diff options
Diffstat (limited to 'subversion/include')
| -rw-r--r-- | subversion/include/private/svn_client_private.h | 6 | ||||
| -rw-r--r-- | subversion/include/private/svn_subr_private.h | 13 | ||||
| -rw-r--r-- | subversion/include/svn_config.h | 6 | ||||
| -rw-r--r-- | subversion/include/svn_types.h | 10 | ||||
| -rw-r--r-- | subversion/include/svn_version.h | 6 |
5 files changed, 38 insertions, 3 deletions
diff --git a/subversion/include/private/svn_client_private.h b/subversion/include/private/svn_client_private.h index 3e6efb56dbca..91ea6476b889 100644 --- a/subversion/include/private/svn_client_private.h +++ b/subversion/include/private/svn_client_private.h @@ -306,6 +306,11 @@ svn_client__copy_foreign(const char *url, * The keys for the subtree mergeinfo are the repository root-relative * paths of TARGET_PATH_OR_URL and/or its subtrees, regardless of whether * TARGET_PATH_OR_URL is a URL or WC path. + * + * If RA_SESSION is not NULL, use it to obtain merge information instead of + * opening a new session. The session might be reparented after usage, so + * callers should reparent the session back to their original location if + * needed. */ svn_error_t * svn_client__mergeinfo_log(svn_boolean_t finding_merged, @@ -322,6 +327,7 @@ svn_client__mergeinfo_log(svn_boolean_t finding_merged, svn_depth_t depth, const apr_array_header_t *revprops, svn_client_ctx_t *ctx, + svn_ra_session_t *ra_session, apr_pool_t *result_pool, apr_pool_t *scratch_pool); diff --git a/subversion/include/private/svn_subr_private.h b/subversion/include/private/svn_subr_private.h index a45e6644a6ff..30fbbf264c96 100644 --- a/subversion/include/private/svn_subr_private.h +++ b/subversion/include/private/svn_subr_private.h @@ -26,6 +26,7 @@ #include "svn_types.h" #include "svn_io.h" +#include "svn_version.h" #ifdef __cplusplus @@ -331,6 +332,18 @@ svn_version__at_least(svn_version_t *version, int minor, int patch); +/** Like svn_ver_check_list(), but with a @a comparator parameter. + * Private backport of svn_ver_check_list2() from trunk. + */ +svn_error_t * +svn_ver__check_list2(const svn_version_t *my_version, + const svn_version_checklist_t *checklist, + svn_boolean_t (*comparator)(const svn_version_t *, + const svn_version_t *)); + +/** To minimize merge churn in callers, alias the trunk name privately. */ +#define svn_ver_check_list2 svn_ver__check_list2 + /** @} */ #ifdef __cplusplus diff --git a/subversion/include/svn_config.h b/subversion/include/svn_config.h index c5d697627858..be8ec4cdb981 100644 --- a/subversion/include/svn_config.h +++ b/subversion/include/svn_config.h @@ -732,6 +732,12 @@ typedef svn_error_t * * under @a config_dir. If the callback sets its delete_cred return * flag, delete the associated credential. * + * If @a config_dir is not NULL, it must point to an alternative + * config directory location. If it is NULL, the default location + * is used. + * + * @note @a config_dir may only be NULL in 1.8.2 and later. + * * @note Removing credentials from the config-based disk store will * not purge them from any open svn_auth_baton_t instance. Consider * using svn_auth_forget_credentials() -- from the @a cleanup_func, diff --git a/subversion/include/svn_types.h b/subversion/include/svn_types.h index 6b3a08741fa6..1ad21942e6fe 100644 --- a/subversion/include/svn_types.h +++ b/subversion/include/svn_types.h @@ -219,6 +219,16 @@ svn__apr_hash_index_val(const apr_hash_index_t *hi); || ((s) == APR_OS_START_SYSERR + ERROR_INVALID_NAME)) #endif +/** On Windows, APR_STATUS_IS_EPIPE does not include ERROR_NO_DATA error. + * So we include it.*/ +/* ### These fixes should go into APR. */ +#ifndef WIN32 +#define SVN__APR_STATUS_IS_EPIPE(s) APR_STATUS_IS_EPIPE(s) +#else +#define SVN__APR_STATUS_IS_EPIPE(s) (APR_STATUS_IS_EPIPE(s) \ + || ((s) == APR_OS_START_SYSERR + ERROR_NO_DATA)) +#endif + /** @} */ diff --git a/subversion/include/svn_version.h b/subversion/include/svn_version.h index d466d84e9843..2818a214d077 100644 --- a/subversion/include/svn_version.h +++ b/subversion/include/svn_version.h @@ -72,7 +72,7 @@ extern "C" { * * @since New in 1.1. */ -#define SVN_VER_PATCH 1 +#define SVN_VER_PATCH 4 /** @deprecated Provided for backward compatibility with the 1.0 API. */ @@ -95,7 +95,7 @@ extern "C" { * * Always change this at the same time as SVN_VER_NUMTAG. */ -#define SVN_VER_TAG " (r1503906)" +#define SVN_VER_TAG " (r1534716)" /** Number tag: a string describing the version. @@ -121,7 +121,7 @@ extern "C" { * When rolling a tarball, we automatically replace it with what we * guess to be the correct revision number. */ -#define SVN_VER_REVISION 1503906 +#define SVN_VER_REVISION 1534716 /* Version strings composed from the above definitions. */ |