all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Stefan Kangas <stefan@marxist.se>
To: "Wedler, Christoph" <christoph.wedler@sap.com>,
	"rms@gnu.org" <rms@gnu.org>
Cc: "43275@debbugs.gnu.org" <43275@debbugs.gnu.org>
Subject: bug#43275: Upgrade antlr-mode to latest version
Date: Wed, 9 Sep 2020 08:28:23 -0700	[thread overview]
Message-ID: <CADwFkmmtDYnPqL5_FLururBdwm3w-vShuDRVYnKLXa=QxzjCSg@mail.gmail.com> (raw)
In-Reply-To: <8E743CED-49F8-4D74-A289-389CCAD6F330@sap.com>

"Wedler, Christoph" <christoph.wedler@sap.com> 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.





  reply	other threads:[~2020-09-09 15:28 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-08 11:58 bug#43275: Upgrade antlr-mode to latest version Stefan Kangas
2020-09-08 12:53 ` Stefan Kangas
2020-09-09  3:48 ` Richard Stallman
2020-09-09 11:22   ` Wedler, Christoph
2020-09-09 12:40     ` Stefan Kangas
2020-09-09 13:01       ` Stefan Kangas
2020-09-09 14:33         ` Wedler, Christoph
2020-09-09 15:28           ` Stefan Kangas [this message]
2021-01-01 18:56             ` Stefan Kangas
2022-01-27  3:13               ` Stefan Kangas
2024-02-04 12:15             ` Stefan Kangas
2020-09-10  2:38     ` Richard Stallman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CADwFkmmtDYnPqL5_FLururBdwm3w-vShuDRVYnKLXa=QxzjCSg@mail.gmail.com' \
    --to=stefan@marxist.se \
    --cc=43275@debbugs.gnu.org \
    --cc=christoph.wedler@sap.com \
    --cc=rms@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.