From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Niklas Eklund <niklas.eklund@posteo.net>
Cc: emacs-devel@gnu.org
Subject: Re: Update readme file for dtache.el package
Date: Sun, 01 May 2022 12:52:44 -0400 [thread overview]
Message-ID: <jwvee1dci6l.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <875ymr3su2.fsf@posteo.net> (Niklas Eklund's message of "Sat, 30 Apr 2022 07:59:01 +0000")
Niklas Eklund [2022-04-30 07:59:01] wrote:
> at sourcehut where the package now resides they favor markdown files
> over org files. I have therefore created a README.md that should now be
> used instead of the old README.org.
Note that GNU ELPA is not following your changes upstream anyway because
you haven't resolved the divergence I mentioned a few days ago:
% make fetch/dtache
emacs --no-site-lisp --batch -l admin/elpa-admin.el -f elpaa-batch-fetch-and-show "dtache"
Fetching updates for dtache...
Upstream of dtache has DIVERGED!
Local changes:
b762fe472f niklas.eklund@.. Announce development migration
Upstream changes:
4ecda689e4 niklas.eklund@.. Update dtache to version 0.6
aee3289eb1 niklas.eklund@.. Improve README.md
5d9b3bac44 niklas.eklund@.. Add section to README.md
3590a26d1c niklas.eklund@.. Fix source blocks in README.md
ee05ecf597 niklas.eklund@.. Update contributor section of README.md
28e7e0d28d info@protesila.. Fix small markup error in README files
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
%
IOW, you still need to `git merge b762fe472f` (*not* rebase) into the
SourceHut branch, before `elpa.git` can continue tracking that branch.
Stefan
prev parent reply other threads:[~2022-05-01 16:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-30 7:59 Update readme file for dtache.el package Niklas Eklund
2022-05-01 7:03 ` Tassilo Horn
2022-05-01 16:52 ` Stefan Monnier [this message]
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=jwvee1dci6l.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).