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

[rh...@apache.org]

Author: rhuijben
Date: Wed Nov 16 13:39:59 2016
New Revision: 1769978

URL: http://svn.apache.org/viewvc?rev=1769978&view=rev
Log:
* STATUS: Approve r1760570. I don't see a conflict on merging.

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=1769978&r1=1769977&r2=1769978&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Wed Nov 16 13:39:59 2016
@@ -67,16 +67,6 @@ Candidate changes:
    Votes:
      +1: stsp, rhuijben
 
- * r1760570
-   Fix a spurious 'incoming edit' tree conflict with an unmodified file.
-   Justification:
-     Tree conflicts should not be raised unnecessarily.
-   Notes:
-     Depends on r1734106 to be merged first to avoid a text conflict
-     in the test suite code.
-   Votes:
-     +1: stsp, stefan2
-
  * r1761334
    Fix issue #4653: SVN_LOCALE_DIR incorrectly interpolated when
    prefix is not set explicitly.
@@ -156,3 +146,13 @@ Veto-blocked changes:
 
 Approved changes:
 =================
+
+ * r1760570
+   Fix a spurious 'incoming edit' tree conflict with an unmodified file.
+   Justification:
+     Tree conflicts should not be raised unnecessarily.
+   Notes:
+     Depends on r1734106 to be merged first to avoid a text conflict
+     in the test suite code.
+   Votes:
+     +1: stsp, stefan2, rhuijben