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

[pb...@apache.org]

Author: pburba
Date: Sat Jun  1 12:23:52 2013
New Revision: 1488507

URL: http://svn.apache.org/r1488507
Log:
* STATUS: Correct the nominated revision for the issue #4370 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=1488507&r1=1488506&r2=1488507&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Sat Jun  1 12:23:52 2013
@@ -58,13 +58,14 @@ Candidate changes:
    Votes:
      +1: ivan
 
- * r1488183
+ * 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: danielsh (Paul: I think you meant r1488267)
+     -1: danielsh (Paul: I think you meant r1488267.
+                   Oops, I did, I fixed that - pburba)
      +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.)