From commits-return-10564-archive-asf-public=cust-asf.ponee.io@groovy.apache.org Tue Jan 14 00:00:21 2020 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 [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 91FDE18064E for ; Tue, 14 Jan 2020 01:00:21 +0100 (CET) Received: (qmail 45416 invoked by uid 500); 14 Jan 2020 00:00:21 -0000 Mailing-List: contact commits-help@groovy.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@groovy.apache.org Delivered-To: mailing list commits@groovy.apache.org Received: (qmail 45407 invoked by uid 99); 14 Jan 2020 00:00:20 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Jan 2020 00:00:20 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id C634F81F11; Tue, 14 Jan 2020 00:00:20 +0000 (UTC) Date: Tue, 14 Jan 2020 00:00:20 +0000 To: "commits@groovy.apache.org" Subject: [groovy] branch java13-build updated (082fe05 -> 66e85f0) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <157896002054.3847.12531497917800241927@gitbox.apache.org> From: sunlan@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: groovy X-Git-Refname: refs/heads/java13-build X-Git-Reftype: branch X-Git-Oldrev: 082fe05eaeb0eb1d2f4ca520a212556d90fd7d2f X-Git-Newrev: 66e85f0e3aae1b38fc52a7564c34c8f16167facc X-Git-NotificationType: ref_changed X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch java13-build in repository https://gitbox.apache.org/repos/asf/groovy.git. discard 082fe05 Fix method conflicts new 66e85f0 Fix method conflicts between JDK and GDK This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (082fe05) \ N -- N -- N refs/heads/java13-build (66e85f0) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../groovy/runtime/StringGroovyMethods.java | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)