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: Wed, 9 Sep 2020 08:28:23 -0700 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="12766"; mail-complaints-to="usenet@ciao.gmane.io" Cc: "43275@debbugs.gnu.org" <43275@debbugs.gnu.org> To: "Wedler, Christoph" , "rms@gnu.org" Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Sep 09 17:29:23 2020 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 1kG22C-0003Bm-Vk for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 09 Sep 2020 17:29:20 +0200 Original-Received: from localhost ([::1]:47296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kG22B-0007qo-1m for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 09 Sep 2020 11:29:19 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41044) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kG21u-0007PU-O0 for bug-gnu-emacs@gnu.org; Wed, 09 Sep 2020 11:29:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:49660) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kG21u-0006EN-CR for bug-gnu-emacs@gnu.org; Wed, 09 Sep 2020 11:29:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kG21u-0003OV-8a for bug-gnu-emacs@gnu.org; Wed, 09 Sep 2020 11:29:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 09 Sep 2020 15:29: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.159966531213012 (code B ref 43275); Wed, 09 Sep 2020 15:29:02 +0000 Original-Received: (at 43275) by debbugs.gnu.org; 9 Sep 2020 15:28:32 +0000 Original-Received: from localhost ([127.0.0.1]:32973 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kG21Q-0003Nn-9Y for submit@debbugs.gnu.org; Wed, 09 Sep 2020 11:28:32 -0400 Original-Received: from mail-ed1-f68.google.com ([209.85.208.68]:41606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kG21O-0003NZ-4e for 43275@debbugs.gnu.org; Wed, 09 Sep 2020 11:28:31 -0400 Original-Received: by mail-ed1-f68.google.com with SMTP id ay8so3069450edb.8 for <43275@debbugs.gnu.org>; Wed, 09 Sep 2020 08:28:30 -0700 (PDT) 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:mime-version:date :message-id:subject:to:cc; bh=swJ/ghbCSGKIJjg0n7AnDnw/egg503vG0mJ9jHz7Q/8=; b=oeylA9n2YXV+nbYp2hho9EXoe97lSJpHOzXSweFpxWEtrMUxUVetAVM4yrJfwaB6jA Rrzrja2GehJvidpRlRWHcI8seVQpffC4JsOA1ZwB4M04tveVs+PEnEEwAFoIIzH3U6di ae4ZBn+RSvaVQxlIclBfG6xnYF5gKRjSYHJr1AzO2ygcAR4aKVtZSEIWwgaCj5tKWmnE 1wErbeUQh65LJ5HucC2DfhS93DLtDw0nslZtpfRMPYNO6ln6VT5cJJc4+d0CcShmxw+y tCXV/RY71B7DezVyyFq2of5ROAI3u6sLWmPgbdhfviIN69qosqn2zAKVcCbCCHFGunXM qa1g== X-Gm-Message-State: AOAM531fLJCtjLDNpgip47pcM7VpO6VbjygCU0ZqDNJy73IlZBnltS+K un7I/MGQjO+6xV5hu4mhcoSSIe/L7v4J8AsrE0w= X-Google-Smtp-Source: ABdhPJzRpyCJlg2zKqhd/v+rEMvpU1f5JXRhlrkwIoDviStEzCY1z34gXHU77s4EeaA/vd7LY6IZ6KMFxQr0LmrDM4U= X-Received: by 2002:a05:6402:445:: with SMTP id p5mr4742058edw.214.1599665303877; Wed, 09 Sep 2020 08:28:23 -0700 (PDT) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Wed, 9 Sep 2020 08:28:23 -0700 In-Reply-To: <8E743CED-49F8-4D74-A289-389CCAD6F330@sap.com> 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:187674 Archived-At: "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.