You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by st...@apache.org on 2021/08/20 12:43:12 UTC

svn commit: r1892472 - /subversion/branches/1.14.x/STATUS

Author: stsp
Date: Fri Aug 20 12:43:11 2021
New Revision: 1892472

URL: http://svn.apache.org/viewvc?rev=1892472&view=rev
Log:
* STATUS: Nominate r1892470 and r1892471.

Modified:
    subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1892472&r1=1892471&r2=1892472&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Fri Aug 20 12:43:11 2021
@@ -98,6 +98,13 @@ Candidate changes:
    Votes:
      +1: danielsh, dsahlberg
 
+ * r1892470, r1892471
+   Fix an assertion failure triggered by the conflict resolver.
+   Justification:
+     Subversion should not crash. User complained.
+   Votes:
+     +1: stsp
+
 Veto-blocked changes:
 =====================