subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1488522 - /subversion/branches/1.8.x/STATUS
Date Sat, 01 Jun 2013 13:10:06 GMT
Author: danielsh
Date: Sat Jun  1 13:10:06 2013
New Revision: 1488522

URL: http://svn.apache.org/r1488522
Log:
Approve r1488267.

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=1488522&r1=1488521&r2=1488522&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Sat Jun  1 13:10:06 2013
@@ -58,17 +58,6 @@ Candidate changes:
    Votes:
      +1: ivan
 
- * r1488267
-   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.)
-     +1: rhuijben
-
  * r1488294
    Add signal information to external program errors.
    Justification:
@@ -98,3 +87,14 @@ Approved changes:
 # that would restart the soak should not be added unless they are resolving
 # blocking issues.  If in doubt see this link for details:
 # http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
+
+ * r1488267
+   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.)
+     +1: rhuijben, danielsh



Mime
View raw message