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

[ju...@apache.org]

Author: julianfoad
Date: Sat Sep 12 09:59:51 2015
New Revision: 1702608

URL: http://svn.apache.org/r1702608
Log:
* STATUS: Propose an extra fix into the r1702299 group (don't crash on merge
  into added), to match the 1.9.x backport proposal.

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=1702608&r1=1702607&r2=1702608&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Sat Sep 12 09:59:51 2015
@@ -69,20 +69,21 @@ Candidate changes:
    Votes:
      +0: julianfoad (he says it works, but I haven't reviewed or tested)
 
- * r1702299, r1702300, r1702397, r1702407
-   Handle automatic merge to local add as error instead of segfault.
+ * 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 and updates the test.
+     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.
    Votes:
-     +1: rhuijben
+     +1 (without r1702565): rhuijben
      -1: julianfoad (the new test fails both without and with the fix, because
                      the 1.8 version of run_and_verify_svn needs an extra arg;
                      so we need a backport branch;
-                     with an initial extra 'None' arg in both calls, +1;
+                     with an initial extra 'None' arg in all three calls, +1;
                      also the 'currently segfaults' comment in the test should
                      be updated)