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

[st...@apache.org]

Author: stsp
Date: Wed Nov 16 14:27:44 2016
New Revision: 1769991

URL: http://svn.apache.org/viewvc?rev=1769991&view=rev
Log:
* STATUS: Vote for issue #4658 fix, approving. Add a note about the
   fact that the merge conflicts if a trunk client is used.

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=1769991&r1=1769990&r2=1769991&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Wed Nov 16 14:27:44 2016
@@ -106,17 +106,6 @@ Candidate changes:
                subversion/tests/libsvn_subr/io-test.c -- would be
                nice to get rid of that before merging the branch)
 
- * r1766352, r1766590
-   Fix issue #4658: Can't reconstruct fulltext from DELTA against PLAIN in FSFS
-   Justification:
-     Prevents access to committed data.  This is as close to a corruption one
-     could get without actually corrupting anything.  User reported issue.
-   Notes:
-     r1766352 contains the actual fix.
-     r1766590 adds a test case for it.
-   Votes:
-     +1: stefan2, rhuijben
-
  * r1766699, r1766704, r1766711
    Fix a bug where reintegrate merges access a non-existent path and error out.
    Justification:
@@ -159,3 +148,15 @@ Approved changes:
   Votes:
     +1 (non-binding): luke1410
     +1: rhuijben, danielsh (via IRC), stsp
+
+ * r1766352, r1766590
+   Fix issue #4658: Can't reconstruct fulltext from DELTA against PLAIN in FSFS
+   Justification:
+     Prevents access to committed data.  This is as close to a corruption one
+     could get without actually corrupting anything.  User reported issue.
+   Notes:
+     r1766352 contains the actual fix.
+     r1766590 adds a test case for it.
+     The merge conflicts if a trunk client is used! 
+   Votes:
+     +1: stefan2, rhuijben, stsp