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

[st...@apache.org]

Author: stefan2
Date: Wed Oct 12 09:52:35 2016
New Revision: 1764424

URL: http://svn.apache.org/viewvc?rev=1764424&view=rev
Log:
* STATUS:
   Vote for and approve r1702299 group (segfault on merge)

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=1764424&r1=1764423&r2=1764424&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Oct 12 09:52:35 2016
@@ -43,20 +43,6 @@ Candidate changes:
    Votes:
      +0: julianfoad (he says it works, but I haven't reviewed or tested)
 
- * r1702299, r1702300, r1702397, r1702407, r1702565
-   Handle merging to local add as error instead of segfault.
-   Justification:
-     Segfault. User reported.
-   Notes:
-     r1702299 adds a testcase.
-     r1702397 fixes the problem with automatic merge and updates the test.
-     r1702565 fixes a quite similar segfault with --reintegrate merge.
-     The other revisions are minor cleanup.
-   Branch:
-     ^/subversion/branches/1.8.x-r1702299
-   Votes:
-     +1: rhuijben, julianfoad
-
  * r1706783
    Really pass patch result to svn_client_patch() filter 
    Justification:
@@ -162,3 +148,18 @@ Veto-blocked changes:
 
 Approved changes:
 =================
+
+ * r1702299, r1702300, r1702397, r1702407, r1702565
+   Handle merging to local add as error instead of segfault.
+   Justification:
+     Segfault. User reported.
+   Notes:
+     r1702299 adds a testcase.
+     r1702397 fixes the problem with automatic merge and updates the test.
+     r1702565 fixes a quite similar segfault with --reintegrate merge.
+     The other revisions are minor cleanup.
+   Branch:
+     ^/subversion/branches/1.8.x-r1702299
+   Votes:
+     +1: rhuijben, julianfoad, stefan2
+