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

Posted to commits@subversion.apache.org by ko...@apache.org on 2015/09/12 01:22:55 UTC

svn commit: r1702568 - /subversion/branches/1.9.x/STATUS

Author: kotkov
Date: Fri Sep 11 23:22:55 2015
New Revision: 1702568

URL: http://svn.apache.org/r1702568
Log:
* STATUS: Extend the r1702397 (segfault during merge to local add) nomination
  with r1702565 and vote for it.

Modified:
    subversion/branches/1.9.x/STATUS

Modified: subversion/branches/1.9.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1702568&r1=1702567&r2=1702568&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Fri Sep 11 23:22:55 2015
@@ -108,16 +108,19 @@ Candidate changes:
    Votes:
      +1: rhuijben, ivan
 
- * 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, ivan
+     +1: kotkov
+     +1: rhuijben (without r1702565)
+     +1: ivan (without r1702565)
 
  * r1702218, r1702474, r1702478
    Fix segfault in 'svn upgrade' of pre-Subversion 1.3 working copies with