From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: updating async on elpa Date: Fri, 30 Apr 2021 10:17:36 -0400 Message-ID: References: <874kfom16w.fsf@posteo.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="8690"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: emacs-devel@gnu.org To: Thierry Volpiatto Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri Apr 30 16:19:15 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lcTz9-00027t-AE for ged-emacs-devel@m.gmane-mx.org; Fri, 30 Apr 2021 16:19:15 +0200 Original-Received: from localhost ([::1]:48768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcTz8-0000Ft-CD for ged-emacs-devel@m.gmane-mx.org; Fri, 30 Apr 2021 10:19:14 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:55542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcTxr-0007cO-DZ for emacs-devel@gnu.org; Fri, 30 Apr 2021 10:17:55 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:13009) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcTxf-0007p0-Uk for emacs-devel@gnu.org; Fri, 30 Apr 2021 10:17:54 -0400 Original-Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 7F84C80057; Fri, 30 Apr 2021 10:17:40 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id C0F2380533; Fri, 30 Apr 2021 10:17:37 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1619792257; bh=MGuuNLg9IS6jgb6badiDjc11S2ewoL3d5RRcoeokidU=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=AHURMM2hyYcprhryckk+IINkyKDrYZQfZvBB5E6l0oh9YYI3f2OIwU2ofY0a6u7jq qSnEbZdk21Cj0Xn4TpUMITTHe3OagoagNY6hV+N0ntvstpos5UxPKK000DLLtLeuki AGMk39kRat9ycFLK4XUzTYZ2aBuKYBTCDm66Go4E46Xo4pcbzlZ4AUjy/T98D4JyLx Cu6j9LuQ4H7GvFxIsspQgK5uqxFPAjMiJYIoc7dJT3+9DfhWI78mmynDwFqRafSm/H GD38NayYvrDThY+/kvZsr+I+I7lfJvqLFs9hg3/GSb78rY05dYF40dkeO6WxJIBqIk RUqDd2FA+5F7g== Original-Received: from alfajor (unknown [108.161.125.61]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 7E8D7120294; Fri, 30 Apr 2021 10:17:37 -0400 (EDT) In-Reply-To: <874kfom16w.fsf@posteo.net> (Thierry Volpiatto's message of "Fri, 30 Apr 2021 11:56:52 +0000") Received-SPF: pass client-ip=132.204.25.50; envelope-from=monnier@iro.umontreal.ca; helo=mailscanner.iro.umontreal.ca X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:268663 Archived-At: > 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