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 0A9848FCA for ; Fri, 26 Aug 2011 09:10:39 +0000 (UTC) Received: (qmail 91311 invoked by uid 500); 26 Aug 2011 09:10:38 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 91189 invoked by uid 500); 26 Aug 2011 09:10:29 -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 91177 invoked by uid 99); 26 Aug 2011 09:10:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Aug 2011 09:10:28 +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, 26 Aug 2011 09:10:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id F41112388847 for ; Fri, 26 Aug 2011 09:10:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1162034 - /subversion/branches/1.7.x/STATUS Date: Fri, 26 Aug 2011 09:10:06 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110826091006.F41112388847@eris.apache.org> Author: rhuijben Date: Fri Aug 26 09:10:06 2011 New Revision: 1162034 URL: http://svn.apache.org/viewvc?rev=1162034&view=rev Log: * STATUS: Nominate fix for 'svn info' on conflict crash 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=1162034&r1=1162033&r2=1162034&view=diff ============================================================================== --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Fri Aug 26 09:10:06 2011 @@ -74,6 +74,17 @@ Candidate changes: Votes: +1: pburba + * r1162024, r1162033 + Resolve segfault on retrieving svn_wc_entry_t or calling 'svn info' on a + binary conflict. + Justification: + svn info shouldn't crash on a simple (binary) conflict. + Notes: + r1162024 is a test reproducing the segfault. r1162033 fixes both issues + and possibly a few harder to reproduce variants. + Votes: + +1: rhuijben + Veto-blocked changes: =====================