From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#58196: Trivial update to ediprolog Date: Wed, 26 Oct 2022 09:26:33 -0400 Message-ID: References: Reply-To: Stefan Monnier Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39483"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: 58196@debbugs.gnu.org To: Markus Triska Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Oct 26 15:28:50 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1ongSc-0009z0-UM for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 26 Oct 2022 15:28:47 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ongQz-0007hs-Aq; Wed, 26 Oct 2022 09:27:05 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ongQw-0007VF-QL for bug-gnu-emacs@gnu.org; Wed, 26 Oct 2022 09:27:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ongQw-0006wy-Ii for bug-gnu-emacs@gnu.org; Wed, 26 Oct 2022 09:27:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ongQw-0000jS-77 for bug-gnu-emacs@gnu.org; Wed, 26 Oct 2022 09:27:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 26 Oct 2022 13:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58196 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: moreinfo Original-Received: via spool by 58196-submit@debbugs.gnu.org id=B58196.16667908082793 (code B ref 58196); Wed, 26 Oct 2022 13:27:02 +0000 Original-Received: (at 58196) by debbugs.gnu.org; 26 Oct 2022 13:26:48 +0000 Original-Received: from localhost ([127.0.0.1]:53722 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ongQi-0000iy-Bb for submit@debbugs.gnu.org; Wed, 26 Oct 2022 09:26:48 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:17157) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ongQc-0000ig-Db for 58196@debbugs.gnu.org; Wed, 26 Oct 2022 09:26:46 -0400 Original-Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 98E2F807AF; Wed, 26 Oct 2022 09:26:36 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 18F5B8008E; Wed, 26 Oct 2022 09:26:35 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1666790795; bh=OOzDOxHDT8NF5JnILf5PUYDIAHdXtanhkKVAv/qsaqE=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=lWcS6ojSHrDyL2WnyPkWJZ/1cCleT8rajTPe7W4YooG3KRrn/pUapn0aelG8vRyjP 0WylkUV2ThdPzz5bYkPF+5QOPErHoqaz4Ld66mP7QBO1R09fZ7M1Np4GfyTcDrUmn1 9t/yIRpfUoV46DkRk2UjQtPGFFYp787HdYR7wbqPpmz8cns145kXx4dVpE4BqJxpwG z21c6W1vE9i4U7KjKYHD4S6eI64Mz2CM79dFdeJPmW6KBp1b81eol0F8/rONoU5aa/ F3Iif3oCpvggr7q8Tct1oqdDK0ea7boZPuPuTvkVpCfo6mkA9Vj3m0rYDyR6AmFBJ9 gE5tJRU+8nu9w== Original-Received: from pastel (65-110-220-202.cpe.pppoe.ca [65.110.220.202]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id E7C5A120EC5; Wed, 26 Oct 2022 09:26:34 -0400 (EDT) In-Reply-To: (Stefan Monnier's message of "Tue, 18 Oct 2022 10:34:15 -0400") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: "bug-gnu-emacs" Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:246230 Archived-At: > It will make 2 changes: > > - Change copyright line to make it compatible with GNU ELPA requirements. > - Add a `Version: 2.2` header line so GNU ELPA can make a release of the > new code. > - Tell Git that those changes have been merged, so it can properly track > future changes from your repository. I added a hack in GNU ELPA's scripts to deal with the third point, but the other two are still a problem: - As long as you use another copyright line, every time you make a change to that line, the automatic merge will fail because of a merge conflict, so it will require manual intervention. - As long as you don't use the `Version:` header, the scripts won't know when you want to make a new release, so again manual intervention will be needed every time you want to make a release. Could you please please pretty please help me reduce my workload by avoiding those needs for human intervention? The best way you can do that is: cd .../where/you/keep/your/clone/of/ediprolog/ git fetch git://git.sv.gnu.org/emacs/elpa.git scratch/ediprolog git merge FETCH_HEAD -- Stefan