From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Thierry Volpiatto <thievol@posteo.net>
Cc: emacs-devel@gnu.org
Subject: Re: updating async on elpa
Date: Fri, 30 Apr 2021 10:17:36 -0400 [thread overview]
Message-ID: <jwvtunnamke.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <874kfom16w.fsf@posteo.net> (Thierry Volpiatto's message of "Fri, 30 Apr 2021 11:56:52 +0000")
> I just pushed last emacs-async changes to Elpa, but I am unsure if I did
> it correctly as the way to merge externals repos with Elpa have changed,
> can you verify if all went well.
Hmm... you pushed a new branch called `externals/emacs-async` and
another called `elpa` but you didn't change the branch `externals/async`
which is the one that matters ;-)
I just tried to sync the `async` code on elpa.git and it tells me:
% (cd ../elpa; make sync/async)
emacs --batch -l admin/elpa-admin.el -f elpaa-batch-fetch-and-push "async"
Fetching updates for async...
Upstream of async has DIVERGED!
Local changes:
Depuis https://github.com/jwiegley/emacs-async
d7e7f79ee4..943a75c6a5 -> upstream/async/main
60118ce687 monnier@iro.um.. Get async-pkg.el out of the way
d854a60cfa monnier@iro.um.. * async-bytecomp.el (async-bytecomp--get-package-deps): Fix last change
a4a50337e4 monnier@iro.um.. Use cl-lib an nadvice (re-apply 783af291680d)
Upstream changes:
943a75c6a5 thievol@posteo.. Fix paren error in dired-async
d7e7f79ee4 thievol@posteo.. Update README
630708b150 thievol@posteo.. Merge branch 'master' of github.com:jwiegley/emacs-async
4f78c0c91f thievol@posteo.. Merge pull request #138 from Stebalien/fix/byte-comp-prefix
0fd5d54073 steven@stebali.. Make the async byte compile variable injection regexp "shy"
00c6f3f85b steven@stebali.. fix inclusion of bytecomp variables
06f0ec7d96 thievol@posteo.. Fix typo in previous commit
14f48de586 thievol@posteo.. Fix Makefile
36a10151e7 thievol@posteo.. Change default value of async-bytecomp-allowed-packages to 'all
86aef2c38e johnw@newartis.. Untabify and indent-buffer (#119)
a1bd2ac49c conao3@gmail.com untabify and indent-buffer
036b475a29 thierry.volpia.. Merge pull request #118 from conao3/fix-warnings
fbbba03e98 conao3@gmail.com fix package-lint/check-doc/byte-compiler warnings
11769c1895 thierry.volpia.. Update version in source file as well
d255820c5a thierry.volpia.. Merge branch 'master' of github.com:jwiegley/emacs-async
e81c685741 thierry.volpia.. Update *pkg.el file
03667dde47 johnw@newartis.. Merge pull request #116 from DamienCassou/typos
64bb180201 damien@cassou.me Fix typos
1209cc2ccd thierry.volpia.. Merge pull request #115 from M4rkD/master
c80976d3f5 mark.dawson@sw.. Some rewording of part of README.md
35ab78afb9 thierry.volpia.. Merge pull request #114 from tarsius/forge
6577ae5cf9 jonas@bernoul.li Add forge to async-bytecomp-allowed-packages
67c369555d thierry.volpia.. Fix async-bytecomp--get-package-deps according to
%
so I think before pushing to `externals/async` someone will have to
merge the `elpa.git` changes into
https://github.com/jwiegley/emacs-async.
Stefan
next prev parent reply other threads:[~2021-04-30 14:17 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-30 11:56 updating async on elpa Thierry Volpiatto
2021-04-30 14:17 ` Stefan Monnier [this message]
2021-04-30 15:20 ` Thierry Volpiatto
2021-04-30 16:21 ` Stefan Monnier
2021-04-30 17:42 ` Thierry Volpiatto
2021-04-30 18:36 ` Stefan Monnier
2021-04-30 18:42 ` Stefan Monnier
2021-04-30 18:37 ` Thierry Volpiatto
2021-04-30 18:48 ` Stefan Monnier
2021-04-30 19:31 ` Thierry Volpiatto
2021-04-30 20:21 ` Stefan Monnier
2021-05-01 4:45 ` Thierry Volpiatto
2021-05-01 13:05 ` Yoni Rabkin
2021-05-01 14:22 ` Stefan Monnier
2021-05-01 14:50 ` Thierry Volpiatto
2021-05-01 15:49 ` Stefan Monnier
2021-05-02 20:26 ` (was Re: updating async on elpa) auto-sync for emms Yoni Rabkin
2021-05-03 13:39 ` Stefan Monnier
2021-05-01 13:06 ` updating async on elpa Stefan Monnier
2021-05-01 14:38 ` Thierry Volpiatto
2021-05-01 15:37 ` Thierry Volpiatto
2021-05-01 17:11 ` Stefan Monnier
2021-05-01 18:01 ` Thierry Volpiatto
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=jwvtunnamke.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=thievol@posteo.net \
/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).