subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1839283 - /subversion/branches/1.10.x/STATUS
Date Mon, 27 Aug 2018 08:56:09 GMT
Author: stsp
Date: Mon Aug 27 08:56:09 2018
New Revision: 1839283

URL: http://svn.apache.org/viewvc?rev=1839283&view=rev
Log:
Retract issue #4694 fix nomination for 1.10.

The proposed change is large and yet incomplete. Given that 1.11 isn't
too far off due to our new 6-months release cycle, it makes more sense
to spend our limited resources on backporting genuine bug fixes to 1.10,
rather than backporting new conflict resolver features.

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=1839283&r1=1839282&r2=1839283&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Mon Aug 27 08:56:09 2018
@@ -81,24 +81,6 @@ Candidate changes:
    Votes:
      +1: stsp
 
- * r1836406, r1836408, r1836409, r1836410, r1836972, r1836975
-   Partly fix issue #4694 "cherry-pick edit after file was moved"
-   Justification:
-     Improved resolver support for merges to stable branches.
-   Notes:
-     This fix is incomplete: It works if the file itself was renamed
-     or moved to another directory, but we do not yet handle cases
-     where a parent directory of the file was moved.
-     Summary of proposed revisions:
-     r1836406 fixes wrong assumptions in existing test case
-     r1836408 ensures this resolution option is only applied to files
-     r1836409 partly fixes issue #4694
-     r1836410 fixes test fallout
-     r1836972 removes now unnecessary resolver prompt
-     r1836975 fixes test fallout
-   Votes:
-     +1: stsp
-
  * r1838813
    Let 'svnadmin recover' prune the rep-cache even if it is disabled.
    Justification:



Mime
View raw message