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

[email protected] Tue, 13 May 2025 15:37:32 -0000

Newsgroups	gmane.comp.version-control.subversion.svn
Message-ID	<[email protected]>

Author: stsp
Date: Tue May 13 15:37:32 2025
New Revision: 1925534

URL: http://svn.apache.org/viewvc?rev=1925534&view=rev
Log:
* STATUS (1.14.x): Nominate r1892118.

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=1925534&r1=1925533&r2=1925534&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Tue May 13 15:37:32 2025
@@ -30,6 +30,13 @@ Candidate changes:
   Votes:
     +1: jamessan
 
+* r1892118
+  Fix a NULL pointer dereference in the conflict resolver.
+  Justification:
+    1.14.5 users are running into this crash.
+  Votes:
+   +1: stsp
+
 Veto-blocked changes:
 =====================