Author: julianfoad
Date: Fri Oct 5 15:11:00 2018
New Revision: 1842928
URL: http://svn.apache.org/viewvc?rev=1842928&view=rev
Log:
* CHANGES: Sync 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=1842928&r1=1842927&r2=1842928&view=diff
==============================================================================
--- subversion/branches/1.10.x/CHANGES (original)
+++ subversion/branches/1.10.x/CHANGES Fri Oct 5 15:11:00 2018
@@ -1,3 +1,34 @@
+Version 1.10.3
+(?? Oct 2018, from /branches/1.10.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.10.3
+
+ User-visible changes:
+ - Minor new features and improvements:
+ * Store the HTTPS client cert password (r1842578)
+
+ - Client-side bugfixes:
+ * Fix shelving when custom diff command is configured (issue #4758)
+ * Fix conflict resolver crashes (issue #4744, r1842581, r1842582, r1842583)
+ * Fix conflict resolver endless scan in some cases (r1842586)
+ * Fix "Accept incoming deletion" on locally deleted file (issue #4739)
+ * Fix "resolver adds unrelated moves to move target list" (issue #4766)
+
+ - Server-side bugfixes:
+ * Reject bad PUT before CHECKOUT in v1 HTTP protocol (r1841281)
+ * Let 'svnadmin recover' prune the rep-cache even if disabled (r1842585)
+
+ - Client-side and server-side bugfixes:
+ * Allow commands like 'svn ci --file X' to work when X is a FIFO (r1841282)
+
+ - Other tool improvements and bugfixes:
+ * 'svnadmin verify --keep-going --quiet' shows an error summary (r1842584)
+ * Fix error in german translation for 'svn help merge' (r1837038)
+
+ Developer-visible changes:
+ - General:
+ * Python tests use the current python executable (r1842626)
+
+
Version 1.10.2
(20 Jul 2018, from /branches/1.10.x)
http://svn.apache.org/repos/asf/subversion/tags/1.10.2
Propchange: subversion/branches/1.10.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 5 15:11:00 2018
@@ -100,4 +100,4 @@
/subversion/branches/verify-at-commit/CHANGES:1462039-1462408
/subversion/branches/verify-keep-going/CHANGES:1439280-1546110
/subversion/branches/wc-collate-path/CHANGES:1402685-1480384
-/subversion/trunk/CHANGES:1817773-1835930
+/subversion/trunk/CHANGES:1817773-1842927
