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

[st...@apache.org]

Author: stsp
Date: Thu Nov 17 16:50:42 2016
New Revision: 1770240

URL: http://svn.apache.org/viewvc?rev=1770240&view=rev
Log:
* STATUS (for 1.8.x): Vote for r1706783, approving. Add a note about the fact
  that this merge conflicts if a trunk client is used.

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=1770240&r1=1770239&r2=1770240&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu Nov 17 16:50:42 2016
@@ -44,13 +44,6 @@ Candidate changes:
      +0: julianfoad (he says it works, but I haven't reviewed or tested)
      +1: stefan2
 
- * r1706783
-   Really pass patch result to svn_client_patch() filter 
-   Justification:
-     Without this fix the filter can't determine the result of a patch.
-   Votes:
-     +1: rhuijben, stefan2
-
  * r1711346
    Properly remove tempfiles in svnlook on diff errors such as EPIPE.
    Justification:
@@ -178,3 +171,12 @@ Approved changes:
      didn't properly verify the accepted failures values.
    Votes:
      +1: rhuijben, stefan2, brane
+
+ * r1706783
+   Really pass patch result to svn_client_patch() filter 
+   Justification:
+     Without this fix the filter can't determine the result of a patch.
+   Notes:
+     Merge conflicts if a trunk client is used.
+   Votes:
+     +1: rhuijben, stefan2, stsp