Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 64355200B6C for ; Sun, 28 Aug 2016 18:31:06 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5D7E6160AB4; Sun, 28 Aug 2016 16:31:06 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A2AB4160AA6 for ; Sun, 28 Aug 2016 18:31:05 +0200 (CEST) Received: (qmail 25618 invoked by uid 500); 28 Aug 2016 16:31:04 -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 25608 invoked by uid 99); 28 Aug 2016 16:31:04 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Aug 2016 16:31:04 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 5F27AC05BE for ; Sun, 28 Aug 2016 16:31:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.374 X-Spam-Level: X-Spam-Status: No, score=0.374 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id yZN84m3EiMsi for ; Sun, 28 Aug 2016 16:31:03 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id 9DC665F610 for ; Sun, 28 Aug 2016 16:31:03 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id E49A6E00B8 for ; Sun, 28 Aug 2016 16:31:02 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id E7EF43A031D for ; Sun, 28 Aug 2016 16:31:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1758131 - /subversion/branches/1.9.x/STATUS Date: Sun, 28 Aug 2016 16:31:01 -0000 To: commits@subversion.apache.org From: luke1410@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160828163101.E7EF43A031D@svn01-us-west.apache.org> archived-at: Sun, 28 Aug 2016 16:31:06 -0000 Author: luke1410 Date: Sun Aug 28 16:31:01 2016 New Revision: 1758131 URL: http://svn.apache.org/viewvc?rev=1758131&view=rev Log: * STATUS: Nominate r1758128-30 Modified: subversion/branches/1.9.x/STATUS Modified: subversion/branches/1.9.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1758131&r1=1758130&r2=1758131&view=diff ============================================================================== --- subversion/branches/1.9.x/STATUS (original) +++ subversion/branches/1.9.x/STATUS Sun Aug 28 16:31:01 2016 @@ -114,6 +114,19 @@ Candidate changes: Votes: +1 stsp +* r1758128, r1758129, r1758130 + Fix issue #4647. + Justification: + Resolves a regression in TSVN 1.9 with the binary conflict resolution + dialog erroring out when selecting to resolve the conflict with the + local file. + Notes: + r1758129 contains the actual fix. + r1758128 adds the regression test. + r1758130 removes the regression test's XFail marker + Votes: + +1 (non-binding): luke1410 + Veto-blocked changes: =====================