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 16:21:33 -0400 [thread overview]
Message-ID: <jwvczub8rvc.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87zgxf5zyz.fsf@posteo.net> (Thierry Volpiatto's message of "Fri, 30 Apr 2021 19:31:05 +0000")
>>>> <user>@git.sv.gnu.org:/srv/git/emacs/elpa.git ?
>>> So no, it is not this,
>> Yes it it, but this only specifies the repository, not the branch.
> Hmm, I understand nothing how the elpa is structured, too complicated for me.
When you push a branch you need to tell to which branch in the remote
repository you're pushing. The syntax is:
git push <repository> <localbranch>:<remotebranch>
so if you're pushing from your local `elpa` branch to elpa.git's
`externals/async` branch, then you need to do:
git push elpa elpa:externals/async
I suspect the problem is that you used a shorthand which works well when
the remote branch has the same name as a the local branch but can't be
used here.
I'm not sure how much simpler we could make it. E.g. if we used
a separate repository per package, then presumably your `elpa` remote
would point to something like git.sv.gnu.org:emacs/elpa/async.git
and you'd need to push to the `main` branch in that repository, which
would still bring the same problem since the name `main` is still
different from the name `elpa` you used for your local branch.
>> In any case, if you push to John's `emacs-async` on Github, I can then
>> bring it into elpa.git with a simple `make sync/async`.
> Done, the branch to merge on elpa is the elpa branch, not master.
Any chance the two branches can be "unified"?
AFAICT the difference are:
- The `Package-Requires:` where `master` says ((emacs "24.3")), whereas
`elpa` says ((cl-lib "0.5") (nadvice "0.3")). Not sure why they need
to be different: we can "merge" them to ((emacs "24.3") (nadvice "0.3")),
since cl-lib in included in Emacs-24.3 (OTOH nadvice appeared with
Emacs-24.4, so I think requiring only Emacs-24.3 is not quite sufficient).
- The `async-pkg.el` which is absent on `elpa` and present on `master`.
Do we actually need it on `master`?
Stefan
next prev parent reply other threads:[~2021-04-30 20:21 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
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 [this message]
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=jwvczub8rvc.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).