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 6864A650B for ; Fri, 15 Jul 2011 09:44:42 +0000 (UTC) Received: (qmail 26987 invoked by uid 500); 15 Jul 2011 09:44:42 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 26803 invoked by uid 500); 15 Jul 2011 09:44:40 -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 26794 invoked by uid 99); 15 Jul 2011 09:44:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jul 2011 09:44:39 +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; Fri, 15 Jul 2011 09:44:33 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9A3CC238896F for ; Fri, 15 Jul 2011 09:44:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1147061 - /subversion/branches/1.7.x/STATUS Date: Fri, 15 Jul 2011 09:44:12 -0000 To: commits@subversion.apache.org From: julianfoad@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110715094412.9A3CC238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: julianfoad Date: Fri Jul 15 09:44:12 2011 New Revision: 1147061 URL: http://svn.apache.org/viewvc?rev=1147061&view=rev Log: * STATUS: Nominate r1146781. Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1147061&r1=1147060&r2=1147061&view=diff ============================================================================== --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Fri Jul 15 09:44:12 2011 @@ -57,6 +57,16 @@ Candidate changes: Votes: +1: arfrever (with r1146899), philip + * r1146781 + Fix a bug in subtree merging. See email thread by Barry Scott, 2011-07-02, + "Assert in svn-1.7-alpha2 svn_client_merge3", + . + Justification: + Notes: + Also applicable to 1.6.x? + Votes: + +1: julianfoad + Approved changes: =================