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 2013/07/02 22:33:24 UTC

svn commit: r1499101 - /subversion/branches/1.8.x/STATUS

Author: stsp
Date: Tue Jul  2 20:33:24 2013
New Revision: 1499101

URL: http://svn.apache.org/r1499101
Log:
* STATUS: Nominate r1499095 and r1499096.

Modified:
    subversion/branches/1.8.x/STATUS

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1499101&r1=1499100&r2=1499101&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Jul  2 20:33:24 2013
@@ -177,6 +177,17 @@ Candidate changes:
    Votes:
      +1: stsp
 
+ * r1499095, r1499096
+   Fix issue #4388, crash during tree conflict resolution.
+   Justification:
+     Segfault can be triggered by sequence of client commands (see issue).
+     Regression from 1.7.
+   Notes:
+     r1499095 fixes the crash shown in the issue.
+     r1499096 should prevent a similar problem, found by code inspection.
+   Votes:
+      +1: stsp
+
 Veto-blocked changes:
 =====================