emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Update readme file for dtache.el package


From: Stefan Monnier
Subject: Re: Update readme file for dtache.el package
Date: Sun, 01 May 2022 12:52:44 -0400
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux)

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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]