Author: stsp
Date: Thu Feb 4 11:47:44 2021
New Revision: 1886195
URL: http://svn.apache.org/viewvc?rev=1886195&view=rev
Log:
* CHANGES (1.10.x): Merge from trunk.
Modified:
subversion/branches/1.10.x/CHANGES (contents, props changed)
Modified: subversion/branches/1.10.x/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/CHANGES?rev=1886195&r1=1886194&r2=1886195&view=diff
==============================================================================
--- subversion/branches/1.10.x/CHANGES (original)
+++ subversion/branches/1.10.x/CHANGES Thu Feb 4 11:47:44 2021
@@ -13,12 +13,14 @@ Version 1.10.7
* Fix non-deterministic generation of mergeinfo (issue #4862)
* Fix a crash seen when using git-svn with kwallet (r1875680)
* Fix merge removing a folder with non-inheritable mergeinfo (issue #4859)
+ * Fix 'svn info --xml' gives wrong 'source-right' of conflict (issue #4869)
- Server-side bugfixes:
* mod_dav_svn: install cleanup handler for FS warning logging (r1865266)
* mod_dav_svn: Fix missing Last-Modified header on 'external' GET requests
(r1866425)
* Fix formatting type size mismatches in FSFS (r1865987, -8)
* Fix an undefined behavior problem in FSFS caching code (r1876054)
+ * Fix a potential NULL dereference in the config file parser (r1886019)
Developer-visible changes:
* Fix Requires(.private) fields in pkg-config files (r1863987, -90)
Propchange: subversion/branches/1.10.x/CHANGES
------------------------------------------------------------------------------
Merged /subversion/trunk/CHANGES:r1886017-1886194
