Author: rhuijben
Date: Tue Mar 29 07:26:36 2022
New Revision: 1899344
URL: http://svn.apache.org/viewvc?rev=1899344&view=rev
Log:
* STATUS: Approve conflict resolver assertion group
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=1899344&r1=1899343&r2=1899344&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Tue Mar 29 07:26:36 2022
@@ -39,16 +39,6 @@ Candidate changes:
votes:
+1: rhuijben
- * r1892470, r1892471, r1892541
- Fix an assertion failure triggered by the conflict resolver.
- Justification:
- Subversion should not crash. User complained.
- Votes:
- +1: stsp, markphip
- +0: dsahlberg (test suite passes for 'check', 'davautocheck' and
- 'svnserveautocheck'. Not enough C experience for a formal
- review)
-
Veto-blocked changes:
=====================
@@ -90,3 +80,13 @@ Approved changes:
1.14.x-r1881534-no-crlf
Votes:
+1: hartmannathan, stsp, markphip
+
+ * r1892470, r1892471, r1892541
+ Fix an assertion failure triggered by the conflict resolver.
+ Justification:
+ Subversion should not crash. User complained.
+ Votes:
+ +1: stsp, markphip, rhuijben
+ +0: dsahlberg (test suite passes for 'check', 'davautocheck' and
+ 'svnserveautocheck'. Not enough C experience for a formal
+ review)
