Author: stsp Date: Mon Aug 23 09:29:44 2021 New Revision: 1892542 URL: http://svn.apache.org/viewvc?rev=1892542&view=rev Log: * STATUS: Nominate r1892541.
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=1892542&r1=1892541&r2=1892542&view=diff ============================================================================== --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Mon Aug 23 09:29:44 2021 @@ -98,13 +98,14 @@ Candidate changes: Votes: +1: danielsh, dsahlberg - * r1892470, r1892471 + * r1892470, r1892471, r1892541 Fix an assertion failure triggered by the conflict resolver. Justification: Subversion should not crash. User complained. Votes: +1: stsp - -1: dsahlberg (FAILURE in conflicts-test, see dev@, comments to r1892471) + -1: dsahlberg (without r1892541: + FAILURE in conflicts-test, see dev@, comments to r1892471) Veto-blocked changes: =====================