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

[pb...@apache.org]

Author: pburba
Date: Mon May 23 19:02:47 2011
New Revision: 1126661

URL: http://svn.apache.org/viewvc?rev=1126661&view=rev
Log:
* STATUS: Remove one of the veto justifications for the r916286 group.  The
  problem I encountered trying to replicate the commit failure that r916286
  fixed is a separate problem, see
  http://svn.haxx.se/dev/archive-2011-05/0806.shtml.  The r916286 group still
  needs a backport branch however.

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=1126661&r1=1126660&r2=1126661&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Mon May 23 19:02:47 2011
@@ -96,13 +96,7 @@ Veto-blocked changes:
          So problem #1: This won't build.
          
          Problem #2: Since I first made this veto, further changes were
-         backported which prevent a clean merge.
-         
-         Problem #3: I tried to create a backport branch to address the
-         conflicts and makes use of svn_path_canonicalize instead of
-         svn_uri_canonicalize.  Unfortunately I cannot replicate the error
-         described in the log message for r916286 - see
-         http://svn.haxx.se/dev/archive-2011-05/0545.shtml)
+         backported which prevent a clean merge.)
 
  * r933194
    Fix for issue #2753