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

Posted to commits@subversion.apache.org by hw...@apache.org on 2010/03/16 15:35:33 UTC

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

Author: hwright
Date: Tue Mar 16 14:35:33 2010
New Revision: 923760

URL: http://svn.apache.org/viewvc?rev=923760&view=rev
Log:
* STATUS: Add a note for the r904301 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=923760&r1=923759&r2=923760&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue Mar 16 14:35:33 2010
@@ -232,6 +232,9 @@ Approved changes:
    except in CHANGES (for sentimental reasons, I guess).
    Justification:
      Tools and doc references should point at the new locations.
+   Notes:
+     Merge has a number of conflicts.  Although singly they may be easy to
+     resolve, I recommend a backport branch because of the volume.
    Votes:
      +1: neels, cmpilato, rhuijben