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 16:21:33 -0400 Message-ID: References: <874kfom16w.fsf@posteo.net> <871rarn69c.fsf@posteo.net> <87y2czll5a.fsf@posteo.net> <87o8dvty56.fsf@posteo.net> <87zgxf5zyz.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="30055"; 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 22:22:32 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 1lcZei-0007gn-8D for ged-emacs-devel@m.gmane-mx.org; Fri, 30 Apr 2021 22:22:32 +0200 Original-Received: from localhost ([::1]:51856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcZeh-0007KJ-9b for ged-emacs-devel@m.gmane-mx.org; Fri, 30 Apr 2021 16:22:31 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50560) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcZdw-0006pT-Lk for emacs-devel@gnu.org; Fri, 30 Apr 2021 16:21:44 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:52578) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcZdt-00034o-VO for emacs-devel@gnu.org; Fri, 30 Apr 2021 16:21:43 -0400 Original-Received: from pmg3.iro.umontreal.ca (localhost [127.0.0.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 633364406AD; Fri, 30 Apr 2021 16:21:40 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 93173440714; Fri, 30 Apr 2021 16:21:34 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1619814094; bh=Rzi1eVEDwGSiCaAWeblDukAetqhIPzUnUAqsPdReeDg=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=ZwMS+gEvrseAaf5CzXaKWume6Wpa6oH3gFcGNsaLUBrrM2WUBfMp56nuWYwspKRCN O82W3RG0NPocmGhKMsLN4ZOiiN18G4iJeMnUSEQIOa44oZqPsB+FPYgh3+ldXX64hi FZL3HsDoMzuL8JHEwLlMOIRAYwCWhz42zh+jsFdKfQ2o5BiUzib2h/g/7HsXc72CvK R/WqVzehpCPu12J/7ww0MlijCLeezHqSvGYHJa/4+M1EmAzUSeQmym5KvkZimaHjci NB1YITl2l1C208IHQJaqm4JrerbIiWRnMnXCol3vCRCpWNDMumhB0+nGo94wPUdxlK vJqgqgmom2V5g== Original-Received: from alfajor (unknown [108.161.125.61]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 63F491201C3; Fri, 30 Apr 2021 16:21:34 -0400 (EDT) In-Reply-To: <87zgxf5zyz.fsf@posteo.net> (Thierry Volpiatto's message of "Fri, 30 Apr 2021 19:31:05 +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:268694 Archived-At: >>>> @git.sv.gnu.org:/srv/git/emacs/elpa.git ? >>> So no, it is not this, >> Yes it it, but this only specifies the repository, not the branch. > Hmm, I understand nothing how the elpa is structured, too complicated for me. When you push a branch you need to tell to which branch in the remote repository you're pushing. The syntax is: git push : so if you're pushing from your local `elpa` branch to elpa.git's `externals/async` branch, then you need to do: git push elpa elpa:externals/async I suspect the problem is that you used a shorthand which works well when the remote branch has the same name as a the local branch but can't be used here. I'm not sure how much simpler we could make it. E.g. if we used a separate repository per package, then presumably your `elpa` remote would point to something like git.sv.gnu.org:emacs/elpa/async.git and you'd need to push to the `main` branch in that repository, which would still bring the same problem since the name `main` is still different from the name `elpa` you used for your local branch. >> In any case, if you push to John's `emacs-async` on Github, I can then >> bring it into elpa.git with a simple `make sync/async`. > Done, the branch to merge on elpa is the elpa branch, not master. Any chance the two branches can be "unified"? AFAICT the difference are: - The `Package-Requires:` where `master` says ((emacs "24.3")), whereas `elpa` says ((cl-lib "0.5") (nadvice "0.3")). Not sure why they need to be different: we can "merge" them to ((emacs "24.3") (nadvice "0.3")), since cl-lib in included in Emacs-24.3 (OTOH nadvice appeared with Emacs-24.4, so I think requiring only Emacs-24.3 is not quite sufficient). - The `async-pkg.el` which is absent on `elpa` and present on `master`. Do we actually need it on `master`? Stefan