unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: Dmitry Gutov <dgutov@yandex.ru>
Cc: 15310@debbugs.gnu.org
Subject: bug#15310: 24.3.50; [ELPA] Better commit notifications for upstream authors
Date: Wed, 11 Sep 2013 13:09:22 -0400	[thread overview]
Message-ID: <jwv7gen2t5u.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <871u4znfjb.fsf@yandex.ru> (Dmitry Gutov's message of "Mon, 09 Sep 2013 00:56:40 +0300")

> The commits are all sent together (one notification email per push,
> AFAICS), as a plain-text email without attachments.

Indeed.  That's basically what Savannah's email notification gives us
(we can somewhat tweak it, the current config can be seen in
http://git.savannah.gnu.org/r/emacs/elpa.git/config, although we do not
have direct write access to it).

> Is there a better way to work with these emails?

"patch -p2" will strip off the "a/packages/" prefix.

> If no, it would be better if, for example, the script preparing these
> emails identified commits not synced from upstream (maybe by file paths
> inside the diffs?), fixed the paths, and attached these commits in patch
> format that's accepted by 'git am' and already contains the commit
> message and author information.

There's a copy of the script I use in elpa/admin/forward-diffs.py.
Improvements are welcome.

This said, I try to "push" the syncs separately from local changes, so
that an email should either contain a "sync" that you can completely
disregard, or only local changes.  This should be even more true once
I get a new cron job that does the syncs semi-automatically
(i.e. automatically when there's no conflict).  In that case you should
be able to pass the whole email to "patch -p2".


        Stefan





  reply	other threads:[~2013-09-11 17:09 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-08 21:56 bug#15310: 24.3.50; [ELPA] Better commit notifications for upstream authors Dmitry Gutov
2013-09-11 17:09 ` Stefan Monnier [this message]
2021-05-30  6:00   ` Lars Ingebrigtsen
2021-07-02 11:15     ` Lars Ingebrigtsen

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

  List information: https://www.gnu.org/software/emacs/

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

  git send-email \
    --in-reply-to=jwv7gen2t5u.fsf-monnier+emacs@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=15310@debbugs.gnu.org \
    --cc=dgutov@yandex.ru \
    /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 public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).