Author: julianfoad
Date: Mon Sep 24 14:33:43 2018
New Revision: 1841857
URL: http://svn.apache.org/viewvc?rev=1841857&view=rev
Log:
* STATUS: Approve r1841753 group (assertion failure in conflict resolver).
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=1841857&r1=1841856&r2=1841857&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Mon Sep 24 14:33:43 2018
@@ -31,13 +31,6 @@ Candidate changes:
Votes:
+1: stsp, jcorvel
- * r1841753, r1841754
- Fix an assertion failure in the conflict resolver.
- Justification:
- Assertions should not get triggered by particular tree conflicts.
- Votes:
- +1: stsp, jcorvel
-
Veto-blocked changes:
=====================
@@ -73,3 +66,10 @@ Approved changes:
1841567 removes bogus '@since 1.X' annotations.
Votes:
+1: julianfoad, brane, rhuijben
+
+ * r1841753, r1841754
+ Fix an assertion failure in the conflict resolver.
+ Justification:
+ Assertions should not get triggered by particular tree conflicts.
+ Votes:
+ +1: stsp, jcorvel, julianfoad
