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 E86C11862C for ; Tue, 19 May 2015 12:32:59 +0000 (UTC) Received: (qmail 423 invoked by uid 500); 19 May 2015 12:32:59 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 395 invoked by uid 500); 19 May 2015 12:32:59 -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 385 invoked by uid 99); 19 May 2015 12:32:59 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 May 2015 12:32:59 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id A0E4FAC012B for ; Tue, 19 May 2015 12:32:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1680270 - /subversion/branches/1.9.x/STATUS Date: Tue, 19 May 2015 12:32:59 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150519123259.A0E4FAC012B@hades.apache.org> Author: rhuijben Date: Tue May 19 12:32:59 2015 New Revision: 1680270 URL: http://svn.apache.org/r1680270 Log: * STATUS: Nominate r1680242. 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=1680270&r1=1680269&r2=1680270&view=diff ============================================================================== --- subversion/branches/1.9.x/STATUS (original) +++ subversion/branches/1.9.x/STATUS Tue May 19 12:32:59 2015 @@ -42,6 +42,16 @@ Other candidate changes: Votes: +1: stefan2 + * r1680242, r1680264 + Stop removing last-change-* on non-updates of file externals (issue 4580) + Justification: + Resolves regression with 1.7.x/1.8.x pre 1.8.13, caused by issue 4411 + patch. This patch implements this fix in a better way and also fixes + an incorrectly recorded url in text conflicts caused by updating a + file external. + Votes: + +1: rhuijben + Veto-blocked changes: =====================