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

[pb...@apache.org]

Author: pburba
Date: Tue May 17 20:48:19 2011
New Revision: 1104547

URL: http://svn.apache.org/viewvc?rev=1104547&view=rev
Log:
* STATUS: Add some notes to my veto of the r916286 group.


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=1104547&r1=1104546&r2=1104547&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue May 17 20:48:19 2011
@@ -142,9 +142,16 @@ Veto-blocked changes:
          svn_uri_canonicalize.  This API does exist in 1.6, but only for
          testing purposes, see subversion\libsvn_subr\private_uri.h and
          http://svn.apache.org/viewvc?view=revision&revision=876419
-         All that is *probably* needed is a backport branch which makes
-         use of svn_path_canonicalize instead, but this will have to wait
-         until the r878590 group is backported.)
+         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 r878590 - see
+         http://svn.haxx.se/dev/archive-2011-05/0545.shtml)
 
  * r921453, r927184, r927243
    Fix reopened issue #3020 'Reflect dropped/renumbered revisions in