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 2013/05/13 17:45:41 UTC

svn commit: r1481939 - /subversion/branches/1.8.x/STATUS

Author: stsp
Date: Mon May 13 15:45:41 2013
New Revision: 1481939

URL: http://svn.apache.org/r1481939
Log:
* STATUS: Explain Bert's conflict.

Modified:
    subversion/branches/1.8.x/STATUS

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1481939&r1=1481938&r2=1481939&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon May 13 15:45:41 2013
@@ -31,7 +31,9 @@ Candidate changes:
    Votes:
      +1: stsp (for 1.8.0, but not any 1.8.x since it changes the UI)
      +1: steveking
-     -0: rhuijben (requires backport branch. I get a merge conflict using 1.7)
+     -0: rhuijben (requires backport branch. I get a merge conflict using 1.7
+                   <stsp> This is because this group requires r1470246 to
+                          be merged first, as noted under Notes:)
 
  * r1469363, r1469645, r1469674, r1470037, r1470537, r1478220, r1478221,
    r1478465, r1478998, r1480723