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/06/19 18:11:24 UTC

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

Author: stsp
Date: Tue Jun 19 18:11:24 2018
New Revision: 1833867

URL: http://svn.apache.org/viewvc?rev=1833867&view=rev
Log:
* STATUS: Nominate issue #4739 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=1833867&r1=1833866&r2=1833867&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Jun 19 18:11:24 2018
@@ -52,6 +52,18 @@ Candidate changes:
    Votes:
      +1: stsp
 
+ * r1830083, r1833864, r1833866
+   Fix issue #4739, "Accept incoming deletion" option doing nothing
+   for a locally deleted file
+   Justification:
+     Fixes undesirable conflict resolver behaviour.
+   Notes:
+     r1830083 adds a regression test
+     r1833864 fixes the issue
+     r1833866 is a small follow-up fix
+   Votes:
+     +1: stsp
+
 Veto-blocked changes:
 =====================