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 725F5D330 for ; Mon, 10 Dec 2012 17:51:16 +0000 (UTC) Received: (qmail 7378 invoked by uid 500); 10 Dec 2012 17:51:16 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 7318 invoked by uid 500); 10 Dec 2012 17:51:16 -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 7309 invoked by uid 99); 10 Dec 2012 17:51:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Dec 2012 17:51:16 +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, 10 Dec 2012 17:51:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C4BAB238896F; Mon, 10 Dec 2012 17:50:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1419607 - /subversion/branches/1.7.x/STATUS Date: Mon, 10 Dec 2012 17:50:52 -0000 To: commits@subversion.apache.org From: breser@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121210175052.C4BAB238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: breser Date: Mon Dec 10 17:50:52 2012 New Revision: 1419607 URL: http://svn.apache.org/viewvc?rev=1419607&view=rev Log: * STATUS: Vote for issue #4091 and move it to Approved. 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=1419607&r1=1419606&r2=1419607&view=diff ============================================================================== --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Mon Dec 10 17:50:52 2012 @@ -47,19 +47,6 @@ Candidate changes: Votes: +0: rhuijben (I would like to see some test results before backporting) - * r1295418, r1407131, r1407812, r1408650 - Properly handle incoming changes on symlinks (issue #4091) - Justification: - Regression since 1.6.x. Users get unexpected tree conflicts - and assertions. - Notes: - The backport branch contains some testsuite plumbing to allow running - the test to run on operating systems where we don't support symlinks. - Branch: - ^/subversion/branches/1.7.x-r1407131/ - Votes: - +1: philip, rhuijben - * r1409804 Add a delimiter between the two chains in svn_error_compose_create(). Justification: @@ -75,3 +62,16 @@ Veto-blocked changes: Approved changes: ================= + + * r1295418, r1407131, r1407812, r1408650 + Properly handle incoming changes on symlinks (issue #4091) + Justification: + Regression since 1.6.x. Users get unexpected tree conflicts + and assertions. + Notes: + The backport branch contains some testsuite plumbing to allow running + the test to run on operating systems where we don't support symlinks. + Branch: + ^/subversion/branches/1.7.x-r1407131/ + Votes: + +1: philip, rhuijben, breser