Author: hwright
Date: Tue May 17 14:08:59 2011
New Revision: 1104264

URL: http://svn.apache.org/viewvc?rev=1104264&view=rev
Log:
* STATUS: Add a note to the r878590 item.

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=1104264&r1=1104263&r2=1104264&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue May 17 14:08:59 2011
@@ -275,6 +275,9 @@ Approved changes:
      2. Fixes the master information leak via the Location header.
      3. Need this to be ported for the other defect to be ported
         without conflict.
+   Notes:
+     There are non-trivial conflicts when backporting.  Perhaps a branch is in
+     order?
    Votes:
      +1: kameshj, cmpilato, pburba
      -0: julianfoad (seem to be multiple changes here for different reasons -


Reply via email to