You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by jc...@apache.org on 2018/07/12 01:18:28 UTC
svn commit: r1835693 - /subversion/branches/1.10.x/STATUS

Author: jcorvel
Date: Thu Jul 12 01:18:28 2018
New Revision: 1835693

URL: http://svn.apache.org/viewvc?rev=1835693&view=rev
Log:
* STATUS: Vote for r1833836 group (conflict resolver search limit), approving.

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=1835693&r1=1835692&r2=1835693&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Thu Jul 12 01:18:28 2018
@@ -23,19 +23,6 @@ Candidate changes:
    Votes:
      +1: jorton, stsp
 
- * r1833836, r1833842
-   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, philip
-
  * r1830083, r1833864, r1833866
    Fix issue #4739, "Accept incoming deletion" option doing nothing
    for a locally deleted file
@@ -99,3 +86,16 @@ Approved changes:
    Votes:
      +1: stsp, philip, jcorvel
      +0: rhuijben (in concept, not reviewed)
+
+ * r1833836, r1833842
+   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, philip, jcorvel