* CHANGES (1.14.x): Merge from trunk.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.14.x@1886194 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES b/CHANGES
index 8360e6b..656b189 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,12 +14,16 @@
* Fix invalid SQL quoting in working copy upgrade system (r1879198)
* Fix problems in human-readable file size formatting (r1878909, -18, -50)
* Improve an error message from svnmucc (r1877072)
+ * Fix 'svn info --xml' gives wrong 'source-right' of conflict (issue #4869)
+ * Fix filename encoding/quoting when invoking editor on Windows (r1885953)
+ * Convert filename for editor from UTF-8 to the locale's encoding (r1882234)
- Server-side improvements and bugfixes:
* Fix authz doesn't combine global and repository rules (issue #4762)
* Make the hot-backup.py script work with Python 3 (r1878855, r1878859)
* Fix an uninitialized read in FSFS (r1880374)
* Make mailer.py work properly with Python 3 (r1884427 et al)
+ * Fix a potential NULL dereference in the config file parser (r1886019)
Developer-visible changes:
- General:
@@ -41,6 +45,7 @@
* autogen.sh: Remove .swig_*_checked files from release tarballs (r1878413)
* Avoid version check for Python if --without-swig is used (r1876662)
* siwg-py: Fix a syntax error for Python 3.6 and later (r1885112)
+ * Fix several crashes and JNI warnings in javahl TunnelAgent (r1886029)
Version 1.14.0
(27 May 2020, from /branches/1.14.x)
@@ -269,12 +274,14 @@
* 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)
