emacs-devel
[Top][All Lists]
Advanced

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

Re: updating async on elpa


From: Stefan Monnier
Subject: Re: updating async on elpa
Date: Fri, 30 Apr 2021 10:17:36 -0400
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux)

> I just pushed last emacs-async changes to Elpa, but I am unsure if I did
> it correctly as the way to merge externals repos with Elpa have changed,
> can you verify if all went well.

Hmm... you pushed a new branch called `externals/emacs-async` and
another called `elpa` but you didn't change the branch `externals/async`
which is the one that matters ;-)

I just tried to sync the `async` code on elpa.git and it tells me:

    % (cd ../elpa; make sync/async)
    emacs --batch -l admin/elpa-admin.el -f elpaa-batch-fetch-and-push "async"
    Fetching updates for async...
    Upstream of async has DIVERGED!
    
      Local changes:
    Depuis https://github.com/jwiegley/emacs-async
       d7e7f79ee4..943a75c6a5             -> upstream/async/main
    60118ce687  monnier@iro.um..  Get async-pkg.el out of the way
    d854a60cfa  monnier@iro.um..  * async-bytecomp.el 
(async-bytecomp--get-package-deps): Fix last change
    a4a50337e4  monnier@iro.um..  Use cl-lib an nadvice (re-apply 783af291680d)
    
      Upstream changes:
    943a75c6a5  thievol@posteo..  Fix paren error in dired-async
    d7e7f79ee4  thievol@posteo..  Update README
    630708b150  thievol@posteo..  Merge branch 'master' of 
github.com:jwiegley/emacs-async
    4f78c0c91f  thievol@posteo..  Merge pull request #138 from 
Stebalien/fix/byte-comp-prefix
    0fd5d54073  steven@stebali..  Make the async byte compile variable 
injection regexp "shy"
    00c6f3f85b  steven@stebali..  fix inclusion of bytecomp variables
    06f0ec7d96  thievol@posteo..  Fix typo in previous commit
    14f48de586  thievol@posteo..  Fix Makefile
    36a10151e7  thievol@posteo..  Change default value of 
async-bytecomp-allowed-packages to 'all
    86aef2c38e  johnw@newartis..  Untabify and indent-buffer (#119)
    a1bd2ac49c  conao3@gmail.com  untabify and indent-buffer
    036b475a29  thierry.volpia..  Merge pull request #118 from 
conao3/fix-warnings
    fbbba03e98  conao3@gmail.com  fix package-lint/check-doc/byte-compiler 
warnings
    11769c1895  thierry.volpia..  Update version in source file as well
    d255820c5a  thierry.volpia..  Merge branch 'master' of 
github.com:jwiegley/emacs-async
    e81c685741  thierry.volpia..  Update *pkg.el file
    03667dde47  johnw@newartis..  Merge pull request #116 from 
DamienCassou/typos
    64bb180201  damien@cassou.me  Fix typos
    1209cc2ccd  thierry.volpia..  Merge pull request #115 from M4rkD/master
    c80976d3f5  mark.dawson@sw..  Some rewording of part of README.md
    35ab78afb9  thierry.volpia..  Merge pull request #114 from tarsius/forge
    6577ae5cf9  jonas@bernoul.li  Add forge to async-bytecomp-allowed-packages
    67c369555d  thierry.volpia..  Fix async-bytecomp--get-package-deps 
according to
    
    %

so I think before pushing to `externals/async` someone will have to
merge the `elpa.git` changes into
https://github.com/jwiegley/emacs-async.


        Stefan




reply via email to

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