Author: philip
Date: Tue Jun 9 15:36:11 2015
New Revision: 1684452
URL: http://svn.apache.org/r1684452
Log:
* subversion/libsvn_subr/version.c
(svn_ver_check_list2): Followup to r1502267, force more relaxed rules
when --disable-strict-version-match is in use.
(svn_ver_compatible): Tweak comment.
Modified:
subversion/trunk/subversion/libsvn_subr/version.c
Modified: subversion/trunk/subversion/libsvn_subr/version.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/version.c?rev=1684452&r1=1684451&r2=1684452&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/version.c (original)
+++ subversion/trunk/subversion/libsvn_subr/version.c Tue Jun 9 15:36:11 2015
@@ -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
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();
