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/23 09:48:18 UTC

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

Author: stsp
Date: Sun Sep 23 09:48:18 2018
New Revision: 1841733

URL: http://svn.apache.org/viewvc?rev=1841733&view=rev
Log:
* STATUS: Nominate r1841725 and r1841731.

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=1841733&r1=1841732&r2=1841733&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Sun Sep 23 09:48:18 2018
@@ -33,6 +33,21 @@ Candidate changes:
    Votes:
      +1: stsp
 
+ * r1841725
+   Use an iterpool during interactive conflict resolution.
+   Justification:
+     Reduces the chance of resource exhaustion in case the resolver goes
+     into an endless loop due to a bug (see r1841731 for an example).
+   Votes:
+     +1: stsp
+
+ * r1841731
+   Fix endless loop in the conflict resolver.
+   Justification:
+     'local missing' conflicts with directories can trigger an endless loop.
+   Votes:
+     +1: stsp
+
 Veto-blocked changes:
 =====================