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 2013/05/17 23:01:26 UTC

svn commit: r1483991 - /subversion/branches/1.8.x/STATUS

Author: pburba
Date: Fri May 17 21:01:26 2013
New Revision: 1483991

URL: http://svn.apache.org/r1483991
Log:
* STATUS: Nominate the issue #4367 test and fix.

Modified:
    subversion/branches/1.8.x/STATUS

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1483991&r1=1483990&r2=1483991&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri May 17 21:01:26 2013
@@ -140,6 +140,18 @@ Candidate changes:
   Votes:
     +1: philip
 
+* r1483125, r1483555, r1483927, r1483947
+  Fix issue #4367 'merge to shallow WC, repeat merge to infinite depth WC is
+  broken'.
+  Justification:
+    Edge case merge can result in incorrect WC state which cannot be
+    committed.
+   Notes:
+     r1483125, r1483555, and r1483927 are a test and some subsequent tweaks
+     for the issue.  r1483947 is the fix proper. 
+  Votes:
+    +1: pburba
+
 Approved for 1.8.1 or if soak is restarted for 1.8.0:
 ====================================================