Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A3384109F6 for ; Mon, 7 Apr 2014 13:53:37 +0000 (UTC) Received: (qmail 55714 invoked by uid 500); 7 Apr 2014 13:53:37 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 55609 invoked by uid 500); 7 Apr 2014 13:53:36 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 55602 invoked by uid 99); 7 Apr 2014 13:53:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Apr 2014 13:53:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Apr 2014 13:53:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 203AB23888FE; Mon, 7 Apr 2014 13:53:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1585483 - /subversion/branches/1.8.x/STATUS Date: Mon, 07 Apr 2014 13:53:14 -0000 To: commits@subversion.apache.org From: philip@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140407135314.203AB23888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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