svn commit: r1836964 - /subversion/branches/1.10.x/STATUS

[ph...@apache.org]

Author: philip
Date: Sun Jul 29 12:02:32 2018
New Revision: 1836964

URL: http://svn.apache.org/viewvc?rev=1836964&view=rev
Log:
* STATUS: Vote/approve issue 4744 fix.

Modified:
    subversion/branches/1.10.x/STATUS

Modified: subversion/branches/1.10.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1836964&r1=1836963&r2=1836964&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Sun Jul 29 12:02:32 2018
@@ -15,19 +15,6 @@ Status of 1.10.3:
 Candidate changes:
 ==================
 
- * r1833895, r1833897, r1833899, r1833901
-   Fix issue #4744 "during merge: assertion failed (start_rev > end_rev)"
-   Justification:
-     Fixes undesirable conflict resolver behaviour.
-   Notes:
-     r1833895 adds a regression test
-     r1833897 prevents offer of a non-working resolution option
-     r1833899 fixes accidental test breakage introduced by r1833897
-     r1833901 prevents the assertion failure and adjusts the test
-     Issue #4739 fix should be merged before this to avoid merge conflicts.
-  Votes:
-    +1: stsp, jcorvel
-
  * r1833465
    Enforce the v1 HTTP protocol when a client sends PUT before CHECKOUT.
    Justification:
@@ -63,3 +50,16 @@ Veto-blocked changes:
 
 Approved changes:
 =================
+
+ * r1833895, r1833897, r1833899, r1833901
+   Fix issue #4744 "during merge: assertion failed (start_rev > end_rev)"
+   Justification:
+     Fixes undesirable conflict resolver behaviour.
+   Notes:
+     r1833895 adds a regression test
+     r1833897 prevents offer of a non-working resolution option
+     r1833899 fixes accidental test breakage introduced by r1833897
+     r1833901 prevents the assertion failure and adjusts the test
+     Issue #4739 fix should be merged before this to avoid merge conflicts.
+  Votes:
+    +1: stsp, jcorvel, philip