From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs Subject: bug#43275: Upgrade antlr-mode to latest version Date: Fri, 1 Jan 2021 12:56:07 -0600 Message-ID: References: <8E743CED-49F8-4D74-A289-389CCAD6F330@sap.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="14541"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: "43275@debbugs.gnu.org" <43275@debbugs.gnu.org>, "rms@gnu.org" To: "Wedler, Christoph" Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jan 01 19:57:13 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kvPbs-0003gX-8j for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 01 Jan 2021 19:57:12 +0100 Original-Received: from localhost ([::1]:35456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kvPbr-0003hp-9D for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 01 Jan 2021 13:57:11 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:35434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kvPbi-0003h8-OK for bug-gnu-emacs@gnu.org; Fri, 01 Jan 2021 13:57:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:51555) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kvPbi-0004Sk-HS for bug-gnu-emacs@gnu.org; Fri, 01 Jan 2021 13:57:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kvPbi-0002A0-Gt for bug-gnu-emacs@gnu.org; Fri, 01 Jan 2021 13:57:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 01 Jan 2021 18:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43275 X-GNU-PR-Package: emacs Original-Received: via spool by 43275-submit@debbugs.gnu.org id=B43275.16095273768202 (code B ref 43275); Fri, 01 Jan 2021 18:57:02 +0000 Original-Received: (at 43275) by debbugs.gnu.org; 1 Jan 2021 18:56:16 +0000 Original-Received: from localhost ([127.0.0.1]:34858 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvPax-00028D-Qe for submit@debbugs.gnu.org; Fri, 01 Jan 2021 13:56:16 -0500 Original-Received: from mail-pg1-f172.google.com ([209.85.215.172]:39600) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvPav-000281-9G for 43275@debbugs.gnu.org; Fri, 01 Jan 2021 13:56:13 -0500 Original-Received: by mail-pg1-f172.google.com with SMTP id 30so10162400pgr.6 for <43275@debbugs.gnu.org>; Fri, 01 Jan 2021 10:56:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:in-reply-to:references:user-agent :mime-version:date:message-id:subject:to:cc; bh=5j5tPKfPHH7VlN/OHRUchy7B5ZVRA4gDGsGLOJr9b4U=; b=iebOqrgqTYMojIxMb2auSJmEqPCxHzp23hbwKo27OnkuRHOGZU2+BbCMPd4k/eLBR7 AO6XRHnHzfdPyYGgZLnpb2I7hMXOAWZ3h+hOLmJYPKuT69uvo3fZg7gt7ELOhaRZItYD NTeB6aR0p46/ttK4Q+ZZ222aB6tegIFkH2E05SojBe/0wNfPx9wTsDDW9xaPGwSDgpHN Y2nOSalIQhwWenY4Q87HmLKKwWzP9GnzpCtZB/ZlTq4qGDRCfRkEbrjjypmXKh6fs5IQ Z0WwGiZkSogKK6S7IOvzzqR0e9/T+uAapHAv4m+vac2GchuK4y1tYAx+wM06gY0L7p2U h3nA== X-Gm-Message-State: AOAM530Hbu9PB8ACcw6tupbWK4UxDxovhkOvpLNvoPF7CEQJy7PAWA27 lIBFiej0OI/hoLBn9qPP4qf1aqtx3gQP0/zHgQo= X-Google-Smtp-Source: ABdhPJwVUsnMw8ZNgQWuLTzen+BPmRMrBiu0dGT2dSSS296Fc7faoVXh6y0Rp/I9ZG0z+mozv/MSGLiM/2OWDa30HG0= X-Received: by 2002:a63:6241:: with SMTP id w62mr62001790pgb.67.1609527367485; Fri, 01 Jan 2021 10:56:07 -0800 (PST) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Fri, 1 Jan 2021 12:56:07 -0600 In-Reply-To: (Stefan Kangas's message of "Wed, 9 Sep 2020 08:28:23 -0700") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:197144 Archived-At: Stefan Kangas writes: > "Wedler, Christoph" writes: > >> OK - I would basically do M-x emerge-files-with-ancestor: >> >> - A: my antlr-mode.el 3.1.5 >> - B: lisp/progmodes/antlr-mode.el >> - Ancestor: lisp/progmodes/antlr-mode.el.~emacs-25.1~ (see my ChangeLog comment 2016-11-22), >> >> Does that sounds reasonable? > > I've never used that command, so I unfortunately can't help you with > that. Why not just give it a spin and see what happens? :-) > > Another idea is to just manually look over the commits and apply them > one by one to your sources as it makes sense. > >> If someone can guide me how Emacs handles git, I can probably directly push a change >> >> - starting at branch "master"? >> - which branch to push to? > > To get commit access, you will need to apply for it on Savannah. I'm > not sure about the exact requirements to get commit access. > > If it's easier, you could send a patch here and we can push it for you. > >> - change comment: my ChangeLog starting at 2.2c? > > If you send the patch here first, we can look over the formatting. But > if you already have a GNU conforming ChangeLog, it sounds like a good > idea to adapt it for Emacs. If it's much too big to adapt, I think it's > also okay to fall back to something like: > > * lisp/progmodes/antlr-mode.el: Sync with latest upstream. That was 16 weeks ago. Any updates here? Thanks in advance.