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

Posted to commits@subversion.apache.org by ph...@apache.org on 2013/07/12 19:46:27 UTC

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

Author: philip
Date: Fri Jul 12 17:46:27 2013
New Revision: 1502635

URL: http://svn.apache.org/r1502635
Log:
* STATUS: Vote for 1.8.x-tristate-chunked-request

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=1502635&r1=1502634&r2=1502635&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri Jul 12 17:46:27 2013
@@ -151,14 +151,9 @@ Candidate changes:
    Notes:
      Revision is actually from ^/subversion/branches/tristate-chunked-request
      If we reach a consensus on this design it'll be merged to trunk as well.
-     To review do the following merges (it should just merge once the other
-       two are commited but I could be wrong):
-       svn merge ^/subversion/branches/1.8.x-busted-proxy
-       svn merge -c 'r1500837, r1500857, r1502109' ^/subversion/trunk
-       svn merge --accept=tc -c 1502440 ^/subversion/branches/1.8.x-tristate-chunked-request
-   Depends: ^/subversion/branches/1.8.x-busted-proxy, r1500837, r1500857, r1502109   
+     Subsumes ^/subversion/branches/1.8.x-busted-proxy.
    Votes:
-     +1: breser, ivan, danielsh
+     +1: breser, ivan, danielsh, philip
 
  * r1502577
    Change malfunctions to errors.