You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2021/04/20 13:48:02 UTC

svn commit: r1889013 - /subversion/branches/1.14.x/STATUS

Author: julianfoad
Date: Tue Apr 20 13:48:02 2021
New Revision: 1889013

URL: http://svn.apache.org/viewvc?rev=1889013&view=rev
Log:
* STATUS: Withdraw nomination r1888474/#4874: after updates it is no longer suitable for backport.

Modified:
    subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1889013&r1=1889012&r2=1889013&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Tue Apr 20 13:48:02 2021
@@ -76,18 +76,6 @@ Candidate changes:
    Votes:
      +1: futatuki
 
- * r1888474
-   Fix issue #4874 "Avoid foreign repository merge if repository UUIDs match"
-   Justification:
-     Erroneous/inconsistent merge behaviour that was previously uncaught,
-     encountered in real life.
-   Votes:
-     -0: julianfoad (I agree a warning is best for a patch release)
-      0: danielsh (concerned about introducing a hard error in a patch release;
-		   proposing downgrading the error to a warning at least for 1.14;
-                   see <https://mail-archives.apache.org/mod_mbox/subversion-dev/202104.mbox/%3C20210407195656.GA27545%40tarpaulin.shahaf.local2%3E>;
-		   discussion is ongoing, hence the non-vote)
-
 Veto-blocked changes:
 =====================