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 2014/04/07 15:53:14 UTC

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

Author: philip
Date: Mon Apr  7 13:53:13 2014
New Revision: 1585483

URL: http://svn.apache.org/r1585483
Log:
* STATUS: Note preferred merge order.

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=1585483&r1=1585482&r2=1585483&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon Apr  7 13:53:13 2014
@@ -308,6 +308,7 @@ Candidate changes:
      r1584342 is the fix, r1581810 is a test that fails with a 1.6.16 server.
    Branch:
      ^/subversion/branches/1.8.x-r1584342
+    (merge before ^/subversion/branches/1.8.x-r1584592)
    Votes:
      +1: philip, rhuijben
 
@@ -342,7 +343,7 @@ Candidate changes:
      compatible with 1.8.
    Branch:
      ^/subversion/branches/1.8.x-r1584592
-     (not needed if ^/subversion/branches/1.8.x-r1584342 is merged first)
+     (merge from trunk if ^/subversion/branches/1.8.x-r1584342 is merged first)
    Votes:
      +1: rhuijben, philip