Author: julianfoad
Date: Mon Feb 10 14:21:38 2020
New Revision: 1873858
URL: http://svn.apache.org/viewvc?rev=1873858&view=rev
Log:
Nominate r1872030 group (issue #4840, merge assertion failure).
Modified:
subversion/branches/1.13.x/STATUS
Modified: subversion/branches/1.13.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.13.x/STATUS?rev=1873858&r1=1873857&r2=1873858&view=diff
==============================================================================
--- subversion/branches/1.13.x/STATUS (original)
+++ subversion/branches/1.13.x/STATUS Mon Feb 10 14:21:38 2020
@@ -22,6 +22,15 @@ Candidate changes:
Votes:
+1: stsp
+ * r1872030, r1872031, r1872104, r1872107, r1872108, r1872115, r1872118,
+ r1872121, r1872388, r1872433, r1872910, r1872919, r1872921, r1872922,
+ r1872923, r1872924, r1873294, r1873297
+ 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
+
Veto-blocked changes:
=====================