From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Niklas Eklund <niklas.eklund@posteo.net>
Cc: emacs-devel@gnu.org
Subject: Re: Update URL to dtache.el package
Date: Wed, 27 Apr 2022 18:06:15 -0400 [thread overview]
Message-ID: <jwv7d7ayyh4.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87y1zq5vt7.fsf@posteo.net> (Niklas Eklund's message of "Wed, 27 Apr 2022 16:35:00 +0000")
Niklas Eklund [2022-04-27 16:35:00] wrote:
> I have moved the development of dtache.el, which can be found in ELPA,
> from gitlab to sourcehut. For reference see this commit:
> https://gitlab.com/niklaseklund/dtache/-/commit/b762fe472f1a47d0f1808620d4468aee645654ee
> Here is a patch that updates the URL to the new location.
Thanks. Now we have a problem because the two have diverged:
% make fetch/dtache
emacs --batch -l admin/elpa-admin.el -f elpaa-batch-fetch-and-show "dtache"
Fetching updates for dtache...
Upstream of dtache has DIVERGED!
Local changes:
Depuis https://git.sr.ht/~niklaseklund/dtache
* [nouvelle référence] -> upstream/dtache/main
b762fe472f niklas.eklund@.. Announce development migration
Upstream changes:
bef9614c76 niklas.eklund@.. Update README with build badge
7fe012d48e niklas.eklund@.. Address redraw in tests
35f8f636a7 niklas.eklund@.. Add .build.yml file
6b595f4946 niklas.eklund@.. Add markdown README
%
Could you `git merge b762fe472f` (*not* rebase) into the SourceHut
branch, so that `elpa.git` can continue tracking that new branch?
Stefan
next prev parent reply other threads:[~2022-04-27 22:06 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-27 16:35 Update URL to dtache.el package Niklas Eklund
2022-04-27 19:16 ` Tassilo Horn
2022-04-27 22:06 ` Stefan Monnier [this message]
2022-05-01 21:29 ` Niklas Eklund
2022-05-01 21:36 ` Niklas Eklund
2022-05-02 6:18 ` Stefan Monnier
2022-05-08 23:36 ` Name dtache.el Richard Stallman
2022-05-09 19:26 ` Niklas Eklund
2022-05-20 14:23 ` Niklas Eklund
2022-05-20 14:31 ` Stefan Monnier
2022-05-20 15:19 ` Niklas Eklund
2022-05-20 15:25 ` Stefan Monnier
2022-05-20 15:36 ` Niklas Eklund
2022-05-20 16:33 ` Niklas Eklund
2022-05-20 18:58 ` Stefan Monnier
2022-05-20 19:27 ` Niklas Eklund
2022-05-20 20:44 ` Niklas Eklund
2022-05-20 21:00 ` Stefan Monnier
2022-05-20 21:21 ` Niklas Eklund
2022-05-20 21:35 ` Stefan Monnier
2022-05-21 7:38 ` Niklas Eklund
2022-05-21 14:44 ` Stefan Monnier
2022-05-21 16:13 ` Niklas Eklund
2022-05-20 15:50 ` Eli Zaretskii
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=jwv7d7ayyh4.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=niklas.eklund@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).