Author: svn-role
Date: Mon May 18 04:00:11 2026
New Revision: 1934330
Log:
Merge r1931400 from trunk:
* r1931400
Silence 'unused function' compilation warning.
Justification:
Debugging code should only be compiled with --enable-debug.
Votes:
+1: brane, ivan, dsahlberg
Modified:
subversion/branches/1.15.x/ (props changed)
subversion/branches/1.15.x/STATUS
subversion/branches/1.15.x/subversion/libsvn_subr/mergeinfo.c
Modified: subversion/branches/1.15.x/STATUS
==============================================================================
--- subversion/branches/1.15.x/STATUS Mon May 18 02:39:05 2026
(r1934329)
+++ subversion/branches/1.15.x/STATUS Mon May 18 04:00:11 2026
(r1934330)
@@ -62,8 +62,7 @@ Candidate changes:
Silence all deprecation warnings from the org.tigris JavaHL package.
Justification:
Unnecessary warnings hide actual problems.
- Depends:
- r1933796
+ Depends:
Votes:
+1: brane, dsahlberg
@@ -72,13 +71,12 @@ Candidate changes:
Justification:
Provides fine-grained control of access to restricted methods. The
alternative requires granting access to all "unnamed" modules.
+ Depends:
Notes:
Although this change does not affect backwards compatibility of JavaHL,
it is my opinion that it really should go into a minor release. So we
should either backport to 1.15.0 or wait for 1.16.0.
Tested with JDK 1.8, JDK 11 and JDK 25 on ARM64 macOS.
- Depends:
- r1933877, r1933796
Votes:
+1: brane, dsahlberg
@@ -115,10 +113,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1931400
- Silence 'unused function' compilation warning.
- Justification:
- Debugging code should only be compiled with --enable-debug.
- Votes:
- +1: brane, ivan, dsahlberg
Modified: subversion/branches/1.15.x/subversion/libsvn_subr/mergeinfo.c
==============================================================================
--- subversion/branches/1.15.x/subversion/libsvn_subr/mergeinfo.c Mon May
18 02:39:05 2026 (r1934329)
+++ subversion/branches/1.15.x/subversion/libsvn_subr/mergeinfo.c Mon May
18 04:00:11 2026 (r1934330)
@@ -816,6 +816,7 @@ svn_mergeinfo_parse(svn_mergeinfo_t *mer
return err;
}
+#ifdef SVN_DEBUG
static const char *
rangelist_to_string_debug(const svn_rangelist_t *rl,
apr_pool_t *pool)
@@ -833,6 +834,7 @@ rangelist_to_string_debug(const svn_rang
}
return rls->data;
}
+#endif /* SVN_DEBUG */
static svn_boolean_t
rangelist_is_sorted(const svn_rangelist_t *rangelist)
