Author: julianfoad
Date: Thu Dec  5 10:58:28 2019
New Revision: 1870873

URL: http://svn.apache.org/viewvc?rev=1870873&view=rev
Log:
* STATUS: Although this branch is EOL, let approved changes be merged.

Modified:
    subversion/branches/1.11.x/STATUS

Modified: subversion/branches/1.11.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1870873&r1=1870872&r2=1870873&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Thu Dec  5 10:58:28 2019
@@ -14,13 +14,6 @@ Status of 1.11.2:
 Candidate changes:
 ==================
 
- * r1851920
-   Remove a useless common ancestor search from the conflict resolver.
-   Justification:
-     Current behaviour is inefficient and could lead to dubious conflicts.
-   Votes:
-     +1: stsp, rhuijben
-
  * r1852436
    Make 'svn update' not record a tree conflict when deleting an unmodified
    directory which happens to contain unversioned items.
@@ -33,6 +26,19 @@ Candidate changes:
      +1: stsp
      -0: rhuijben (I would recommend setting a proper svn:ignore instead)
 
+Veto-blocked changes:
+=====================
+
+Approved changes:
+=================
+
+ * r1851920
+   Remove a useless common ancestor search from the conflict resolver.
+   Justification:
+     Current behaviour is inefficient and could lead to dubious conflicts.
+   Votes:
+     +1: stsp, rhuijben
+
  * r1855419
    Fix conflict resolver bug where local and incoming edits got swapped.
    Justification:
@@ -49,9 +55,3 @@ Candidate changes:
      Makes it easier to build Subversion on Windows. Simple local fix.
    Votes:
      +1: rhuijben, jamessan
-
-Veto-blocked changes:
-=====================
-
-Approved changes:
-=================