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 2018/09/23 13:40:27 UTC

svn commit: r1841755 - /subversion/branches/1.11.x/STATUS

Author: stsp
Date: Sun Sep 23 13:40:27 2018
New Revision: 1841755

URL: http://svn.apache.org/viewvc?rev=1841755&view=rev
Log:
* STATUS: Nominate r1841753 and r1841754.

Modified:
    subversion/branches/1.11.x/STATUS

Modified: subversion/branches/1.11.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1841755&r1=1841754&r2=1841755&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Sun Sep 23 13:40:27 2018
@@ -59,6 +59,13 @@ Candidate changes:
    Votes:
      +1: stsp
 
+ * r1841753, r1841754
+   Fix an assertion failure in the conflict resolver.
+   Justification:
+     Assertions should not get triggered by particular tree conflicts.
+   Votes:
+     +1: stsp
+
 Veto-blocked changes:
 =====================