You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2018/09/16 12:57:20 UTC

svn commit: r1840999 - /subversion/branches/1.11.x/STATUS

Author: stsp
Date: Sun Sep 16 12:57:19 2018
New Revision: 1840999

URL: http://svn.apache.org/viewvc?rev=1840999&view=rev
Log:
* STATUS: Nominate r1840990, r1840991, r1840995, r1840997 for 1.11.0.

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=1840999&r1=1840998&r2=1840999&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Sun Sep 16 12:57:19 2018
@@ -15,6 +15,19 @@ Status of 1.11.0:
 Candidate changes:
 ==================
 
+ * r1840990, r1840991, r1840995, r1840997
+   Various conflict resolver improvements.
+   Notes:
+     I am proposing these in a batch because merging them out of order would
+     result in conflicts, and because I was planning to make these changes
+     before 1.11 was branched in the first place but didn't get around to it.
+     - r1840990 is a cosmetic output change
+     - r1840991 prevents an out-of-bounds array access
+     - r1840995 implements support for ambiguous moves in 'local missing' cases
+     - r1840997 improves resolver API semantics
+     Ideally, these should be merged before 1.11.0 is released.
+   Votes:
+     +1: stsp
 
 Veto-blocked changes:
 =====================