Author: stsp
Date: Thu Apr 2 08:35:15 2020
New Revision: 1876034
URL: http://svn.apache.org/viewvc?rev=1876034&view=rev
Log:
* STATUS (1.10.x): Vote for issue #4840 fix, adding r1875188 and r1875189.
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1876034&r1=1876033&r2=1876034&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Thu Apr 2 08:35:15 2020
@@ -17,12 +17,13 @@ Candidate changes:
* r1872030, r1872031, r1872104, r1872107, r1872108, r1872115, r1872118,
r1872121, r1872388, r1872433, r1872910, r1872919, r1872921, r1872922,
- r1872923, r1872924, r1873294, r1873297
+ r1872923, r1872924, r1873294, r1873297, r1875188, r1875189
Fix issue #4840, Merge assertion failure in svn_sort__array_insert
Justification:
A merge with complex mergeinfo could abort with an assertion failure.
Votes:
- +1: julianfoad
+ +1: stsp
+ +1: julianfoad (without r1875188,r1875189)
* r1875680
Construct KAboutData using QString rather than QStringLiteral
