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 10:15:07 UTC

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

Author: stsp
Date: Sun Sep 23 10:15:07 2018
New Revision: 1841737

URL: http://svn.apache.org/viewvc?rev=1841737&view=rev
Log:
* STATUS: Add r1841736 to r1841731 nomination.

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=1841737&r1=1841736&r2=1841737&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Sun Sep 23 10:15:07 2018
@@ -41,10 +41,13 @@ Candidate changes:
    Votes:
      +1: stsp
 
- * r1841731
+ * r1841731, r1841736
    Fix endless loop in the conflict resolver.
    Justification:
      'local missing' conflicts with directories can trigger an endless loop.
+   Notes:
+     r1841731 is the actual fix and test
+     r1841736 is a follow-up fix to make the test pass on Windows
    Votes:
      +1: stsp