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 11:09:20 UTC

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

Author: stsp
Date: Sun Sep 23 11:09:20 2018
New Revision: 1841744

URL: http://svn.apache.org/viewvc?rev=1841744&view=rev
Log:
* STATUS: Add r1841743 to the r1841731 group.

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=1841744&r1=1841743&r2=1841744&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Sun Sep 23 11:09:20 2018
@@ -41,13 +41,14 @@ Candidate changes:
    Votes:
      +1: stsp
 
- * r1841731, r1841736
+ * r1841731, r1841736, r1841743
    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
+     r1841743 is a follow-up fix for the follow-up fix :)
    Votes:
      +1: stsp