You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by pb...@apache.org on 2011/08/31 22:45:05 UTC

svn commit: r1163811 - /subversion/branches/1.7.x/STATUS

Author: pburba
Date: Wed Aug 31 20:45:05 2011
New Revision: 1163811

URL: http://svn.apache.org/viewvc?rev=1163811&view=rev
Log:
* STATUS: Nominate a follow-up (r1163792) to the previously backported
  issue #3975 fixes.

Modified:
    subversion/branches/1.7.x/STATUS

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1163811&r1=1163810&r2=1163811&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Aug 31 20:45:05 2011
@@ -110,6 +110,22 @@ Candidate changes:
    Votes:
      +1: philip
 
+ * r1163792
+   Follow-up to the issue #3975 fixes which were backported in r1161547.
+   Justification:
+      Some merge use cases fail due to the issue #3975 fixes.  However,
+      this failure is legitimate in the sense that it should be expected
+      and cleared, and the merge allowed to continue.  For details, see
+      http://subversion.tigris.org/issues/show_bug.cgi?id=3975#desc6
+   Notes:
+     r1163792 simply catches and clears an error.  While this change needs
+     to get into 1.7.0 (or the issue #3975 fixes need to come out), given
+     the simplicity of the change I don't believe this constitutes a
+     destabilizing change, so IMO does not require a restart of the soak
+     for RC2.
+   Votes:
+     +1: pburba
+
 Veto-blocked changes:
 =====================