From commits-return-49174-archive-asf-public=cust-asf.ponee.io@subversion.apache.org Fri Aug 10 14:15:40 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 57059180630 for ; Fri, 10 Aug 2018 14:15:40 +0200 (CEST) Received: (qmail 23360 invoked by uid 500); 10 Aug 2018 12:15:39 -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 23347 invoked by uid 99); 10 Aug 2018 12:15:39 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Aug 2018 12:15:39 +0000 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 C0A623A0116 for ; Fri, 10 Aug 2018 12:15:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1837795 - /subversion/branches/1.10.x/STATUS Date: Fri, 10 Aug 2018 12:15:38 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180810121538.C0A623A0116@svn01-us-west.apache.org> Author: stsp Date: Fri Aug 10 12:15:38 2018 New Revision: 1837795 URL: http://svn.apache.org/viewvc?rev=1837795&view=rev Log: * STATUS: Propose partial issue #4694 fix. Modified: subversion/branches/1.10.x/STATUS Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1837795&r1=1837794&r2=1837795&view=diff ============================================================================== --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Fri Aug 10 12:15:38 2018 @@ -81,6 +81,24 @@ Candidate changes: Votes: +1: stsp + * r1836406, r1836408, r1836409, r1836410, r1836972, r1836975 + Partly fix issue #4694 "cherry-pick edit after file was moved" + Justification: + Improved resolver support for merges to stable branches. + Notes: + This fix is incomplete: It works if the file itself was renamed + or moved to another directory, but we do not yet handle cases + where a parent directory of the file was moved. + Summary of proposed revisions: + r1836406 fixes wrong assumptions in existing test case + r1836408 ensures this resolution option is only applied to files + r1836409 partly fixes issue #4694 + r1836410 fixes test fallout + r1836972 removes now unnecessary resolver prompt + r1836975 fixes test fallout + Votes: + +1: stsp + Veto-blocked changes: =====================