You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by pb...@apache.org on 2013/05/31 17:44:13 UTC

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

Author: pburba
Date: Fri May 31 15:44:13 2013
New Revision: 1488281

URL: http://svn.apache.org/r1488281
Log:
* STATUS: Nominated issue #4370 '(m)erge interactive conflict resolution
  segfaults when cwd not parent of target' fix.

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=1488281&r1=1488280&r2=1488281&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri May 31 15:44:13 2013
@@ -58,6 +58,16 @@ Candidate changes:
    Votes:
      +1: ivan
 
+ * r1488183
+   Fix issue #4370 '(m)erge interactive conflict resolution segfaults when cwd
+   not parent of target'.
+   Justification:
+     Prevents a segfault in the new 'internal text conflict merge tool'.
+   Votes:
+     +1: pburba (for 1.8.0:  This isn't a 'destabilizing' change per my
+                 reading of our release-stabilization guidelines, so it can
+                 be included in 1.8.0 without a soak restart.)
+
 Veto-blocked changes:
 =====================