diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2018-05-08 03:44:38 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2018-05-08 03:44:38 +0000 |
| commit | 3faf8d6bffc5d0fb2525ba37bb504c53366caf9d (patch) | |
| tree | 7e47911263e75034b767fe34b2f8d3d17e91f66d /subversion/libsvn_subr/version.c | |
| parent | a55fb3c0d5eca7d887798125d5b95942b1f01d4b (diff) | |
Diffstat (limited to 'subversion/libsvn_subr/version.c')
| -rw-r--r-- | subversion/libsvn_subr/version.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/subversion/libsvn_subr/version.c b/subversion/libsvn_subr/version.c index 0210fd8836e59..1aabb400800d8 100644 --- a/subversion/libsvn_subr/version.c +++ b/subversion/libsvn_subr/version.c @@ -40,11 +40,13 @@ svn_subr_version(void) svn_boolean_t svn_ver_compatible(const svn_version_t *my_version, const svn_version_t *lib_version) { - /* With normal development builds the matching rules are strict, to - avoid inadvertantly using the wrong libraries. For backward - compatibility testing use --disable-full-version-match to - configure 1.7 and then the libraries that get built can be used - to replace those in 1.6 or earlier builds. */ + /* With normal development builds the matching rules are stricter + that for release builds, to avoid inadvertantly using the wrong + libraries. For backward compatibility testing of development + builds one can use --disable-full-version-match to cause a + development build to use the release build rules. This allows + the libraries from the newer development build to be used by an + older development build. */ #ifndef SVN_DISABLE_FULL_VERSION_MATCH if (lib_version->tag[0] != '\0') @@ -83,6 +85,11 @@ svn_ver_check_list2(const svn_version_t *my_version, svn_error_t *err = SVN_NO_ERROR; int i; +#ifdef SVN_DISABLE_FULL_VERSION_MATCH + /* Force more relaxed check for --disable-full-version-match. */ + comparator = svn_ver_compatible; +#endif + for (i = 0; checklist[i].label != NULL; ++i) { const svn_version_t *lib_version = checklist[i].version_query(); @@ -136,7 +143,7 @@ svn_version_extended(svn_boolean_t verbose, info->build_time = __TIME__; info->build_host = SVN_BUILD_HOST; info->copyright = apr_pstrdup - (pool, _("Copyright (C) 2017 The Apache Software Foundation.\n" + (pool, _("Copyright (C) 2018 The Apache Software Foundation.\n" "This software consists of contributions made by many people;\n" "see the NOTICE file for more information.\n" "Subversion is open source software, see " @@ -264,7 +271,7 @@ svn_version__parse_version_string(svn_version_t **version_p, svn_boolean_t -svn_version__at_least(svn_version_t *version, +svn_version__at_least(const svn_version_t *version, int major, int minor, int patch) |