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

Posted to commits@subversion.apache.org by st...@apache.org on 2010/05/18 17:47:09 UTC

svn commit: r945711 - /subversion/branches/1.6.x/STATUS

Author: stsp
Date: Tue May 18 15:47:08 2010
New Revision: 945711

URL: http://svn.apache.org/viewvc?rev=945711&view=rev
Log:
* STATUS: Nominate r945708.

Modified:
    subversion/branches/1.6.x/STATUS

Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=945711&r1=945710&r2=945711&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue May 18 15:47:08 2010
@@ -204,6 +204,19 @@ Candidate changes:
    Votes:
      +1: rhuijben, danielsh
 
+ * r945708
+   Fix issue #3469 "tree conflict inside of directory external causes
+   assertion to fail".
+   Justification:
+     Assertion failures are bad and tree-conflicted externals cannot
+     be reverted or resolved without this fix.
+   Branch:
+     ^/subversion/branches/1.6.x-issue3469
+     This is not a backport branch. The fix is for 1.6.x only.
+     Trunk will need a separate fix as part of wc-ng.
+   Votes:
+     +1: stsp
+
 Veto-blocked changes:
 =====================