From: Stefan Monnier via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
To: Markus Triska <triska@metalevel.at>
Cc: 58196@debbugs.gnu.org
Subject: bug#58196: 27.0.50; ediprolog 2.2: Please upload the new version to ELPA
Date: Sat, 01 Oct 2022 14:37:13 -0400 [thread overview]
Message-ID: <jwvfsg7iehu.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <871qrrv5p3.fsf@metalevel.at> (Markus Triska's message of "Sat, 01 Oct 2022 19:01:28 +0200")
> Yes, I have made a public repository available at:
>
> https://github.com/triska/ediprolog/
Could you merge that history with that of elpa.git?
I.e. start with
git remote add -p externals/ediprolog elpa \
git://git.sv.gnu.org/emacs/elpa.git
and then try something like
git merge elpa/externals/ediprolog
It might be rather messy done this way. You may need to start by
merging the elpa history with the closest matching version in your
history (maybe commit 751119cfee9efb52e89d0387d795f3b0c181299d?):
git reset --hard 751119cfee9efb52e89d0387d795f3b0c181299d
git merge elpa/externals/ediprolog
[ resolve any conflicts, and make any other changes you like ]
git merge
elpa.git won't be able to follow your repository until that repository's
HEAD is a "fast forward" so this "merging" is necessary. You can make
it "trivial" by throwing away any and all changes that actually come
from `elpa/externals/ediprolog`: only the metadata needs to say that
the commits of `elpa/externals/ediprolog` have all been merged.
Stefan
next prev parent reply other threads:[~2022-10-01 18:37 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-30 16:59 bug#58196: 27.0.50; ediprolog 2.2: Please upload the new version to ELPA Markus Triska
2022-10-01 12:56 ` Lars Ingebrigtsen
2022-10-01 14:57 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-10-01 17:01 ` Markus Triska
2022-10-01 18:37 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors [this message]
2022-10-02 19:49 ` Markus Triska
2022-10-02 20:07 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-10-02 20:24 ` Markus Triska
2022-10-02 21:08 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-10-03 0:43 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-10-18 14:34 ` bug#58196: Trivial update to ediprolog Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-10-26 13:26 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-10-26 13:32 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-10-27 21:11 ` Markus Triska
2022-10-28 2:08 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-10-28 3:06 ` Stefan Kangas
2022-10-28 3:35 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-10-28 6:35 ` Eli Zaretskii
2022-10-28 12:37 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-10-28 3:09 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-10-28 16:49 ` Markus Triska
2022-10-28 18:07 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-10-28 20:01 ` Stefan Kangas
2022-10-28 20:20 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-10-28 20:51 ` Stefan Kangas
2022-10-28 21:54 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-10-22 16:20 ` Markus Triska
2022-10-22 16:51 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-10-23 7:29 ` Markus Triska
2022-10-25 19:49 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-01-10 10:54 ` bug#58196: 27.0.50; ediprolog 2.2: Please upload the new version to ELPA Stefan Kangas
2024-01-10 22:11 ` Markus Triska
2024-01-10 23:18 ` Stefan Kangas
2024-01-14 7:40 ` Markus Triska
2024-01-14 10:17 ` Stefan Kangas
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=jwvfsg7iehu.fsf-monnier+emacs@gnu.org \
--to=bug-gnu-emacs@gnu.org \
--cc=58196@debbugs.gnu.org \
--cc=monnier@iro.umontreal.ca \
--cc=triska@metalevel.at \
/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.