From commits-return-51042-apmail-subversion-commits-archive=subversion.apache.org@subversion.apache.org Thu Dec 5 10:58:30 2019 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 [207.244.88.153]) by minotaur.apache.org (Postfix) with SMTP id 094DF192FD for ; Thu, 5 Dec 2019 10:58:29 +0000 (UTC) Received: (qmail 83441 invoked by uid 500); 5 Dec 2019 10:58:29 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 83404 invoked by uid 500); 5 Dec 2019 10:58: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 83389 invoked by uid 99); 5 Dec 2019 10:58:29 -0000 Received: from Unknown (HELO svn01-us-east.apache.org) (13.90.137.153) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Dec 2019 10:58:29 +0000 Received: from svn01-us-east.apache.org (svn01-us-east.apache.org [127.0.0.1]) by svn01-us-east.apache.org (ASF Mail Server at svn01-us-east.apache.org) with ESMTP id CE70E17A0E4 for ; Thu, 5 Dec 2019 10:58:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1870873 - /subversion/branches/1.11.x/STATUS Date: Thu, 05 Dec 2019 10:58:28 -0000 To: commits@subversion.apache.org From: julianfoad@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20191205105828.CE70E17A0E4@svn01-us-east.apache.org> Author: julianfoad Date: Thu Dec 5 10:58:28 2019 New Revision: 1870873 URL: http://svn.apache.org/viewvc?rev=1870873&view=rev Log: * STATUS: Although this branch is EOL, let approved changes be merged. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1870873&r1=1870872&r2=1870873&view=diff ============================================================================== --- subversion/branches/1.11.x/STATUS (original) +++ subversion/branches/1.11.x/STATUS Thu Dec 5 10:58:28 2019 @@ -14,13 +14,6 @@ Status of 1.11.2: Candidate changes: ================== - * r1851920 - Remove a useless common ancestor search from the conflict resolver. - Justification: - Current behaviour is inefficient and could lead to dubious conflicts. - Votes: - +1: stsp, rhuijben - * r1852436 Make 'svn update' not record a tree conflict when deleting an unmodified directory which happens to contain unversioned items. @@ -33,6 +26,19 @@ Candidate changes: +1: stsp -0: rhuijben (I would recommend setting a proper svn:ignore instead) +Veto-blocked changes: +===================== + +Approved changes: +================= + + * r1851920 + Remove a useless common ancestor search from the conflict resolver. + Justification: + Current behaviour is inefficient and could lead to dubious conflicts. + Votes: + +1: stsp, rhuijben + * r1855419 Fix conflict resolver bug where local and incoming edits got swapped. Justification: @@ -49,9 +55,3 @@ Candidate changes: Makes it easier to build Subversion on Windows. Simple local fix. Votes: +1: rhuijben, jamessan - -Veto-blocked changes: -===================== - -Approved changes: -=================