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 13:11:51 UTC

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

Author: stsp
Date: Tue Jun 19 13:11:50 2018
New Revision: 1833838

URL: http://svn.apache.org/viewvc?rev=1833838&view=rev
Log:
* STATUS: Nominate r1833836 (issue #4740)

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=1833838&r1=1833837&r2=1833838&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Jun 19 13:11:50 2018
@@ -39,6 +39,19 @@ Candidate changes:
    Votes:
      +1: jorton, stsp
 
+ * r1833836
+   Fix issue #4740, "conflict resolver searches too far back ..."
+   Justification:
+     The current behaviour is hard-coded to traverse all of history in
+     a "local missing vs incoming edit" situation. This is impractical
+     on repositories with a large number of revisions.
+     Easy fix which just runs an already existing YCA search a bit
+     earlier, falling back to full traversal if no YCA can be found.
+     User complained and provided a reproduction script:
+     https://svn.haxx.se/users/archive-2018-04/0060.shtml
+   Votes:
+     +1: stsp
+
 Veto-blocked changes:
 =====================