Return-Path: Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: (qmail 52681 invoked from network); 8 Jun 2010 15:28:34 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 8 Jun 2010 15:28:34 -0000 Received: (qmail 91349 invoked by uid 500); 8 Jun 2010 15:28:34 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 91330 invoked by uid 500); 8 Jun 2010 15:28:34 -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 91323 invoked by uid 99); 8 Jun 2010 15:28:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Jun 2010 15:28:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 08 Jun 2010 15:28:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2F5C5238899C; Tue, 8 Jun 2010 15:28:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r952690 - /subversion/branches/1.6.x/STATUS Date: Tue, 08 Jun 2010 15:28:11 -0000 To: commits@subversion.apache.org From: pburba@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100608152811.2F5C5238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pburba Date: Tue Jun 8 15:28:10 2010 New Revision: 952690 URL: http://svn.apache.org/viewvc?rev=952690&view=rev Log: * STATUS: Note backport branch and vote for r935631. 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=952690&r1=952689&r2=952690&view=diff ============================================================================== --- subversion/branches/1.6.x/STATUS (original) +++ subversion/branches/1.6.x/STATUS Tue Jun 8 15:28:10 2010 @@ -135,8 +135,10 @@ Candidate changes: Fix one of the sanity checks in the 'svn merge --reintegrate' logic. Justification: Sanity checks should themselves be sane. + Branch: + ^/subversion/branches/1.6.x-r935631 Votes: - +1: cmpilato + +1: cmpilato, pburba -0: This introduces new issues like #3242 and might break reintegrate where it previously worked. (Untested)