From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Andy Moreton Newsgroups: gmane.emacs.devel Subject: Re: [SPAM UNSURE] Re: policy discussion on bundling ELPA packages in the emacs tarball Date: Tue, 26 Jan 2021 01:04:56 +0000 Message-ID: <868s8g7bk7.fsf@gmail.com> References: <86eeifawx8.fsf@stephe-leake.org> <87czxygdl9.fsf@russet.org.uk> <86tur88izp.fsf@stephe-leake.org> <831rec5apu.fsf@gnu.org> <87r1magg4x.fsf@russet.org.uk> <86sg6o6c43.fsf@stephe-leake.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="10897"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (windows-nt) To: emacs-devel@gnu.org Cancel-Lock: sha1:dQAK3FBcYzxTavZNDqvSMHihPb8= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Jan 26 02:06:16 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 1l4CoB-0002im-JX for ged-emacs-devel@m.gmane-mx.org; Tue, 26 Jan 2021 02:06:15 +0100 Original-Received: from localhost ([::1]:35066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4CoA-0003DC-L7 for ged-emacs-devel@m.gmane-mx.org; Mon, 25 Jan 2021 20:06:14 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:60388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4Cn4-0002lI-0i for emacs-devel@gnu.org; Mon, 25 Jan 2021 20:05:06 -0500 Original-Received: from ciao.gmane.io ([116.202.254.214]:42136) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4Cn2-00040Z-Gv for emacs-devel@gnu.org; Mon, 25 Jan 2021 20:05:05 -0500 Original-Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1l4Cn0-0001Bs-HM for emacs-devel@gnu.org; Tue, 26 Jan 2021 02:05:02 +0100 X-Injected-Via-Gmane: http://gmane.org/ Received-SPF: pass client-ip=116.202.254.214; envelope-from=ged-emacs-devel@m.gmane-mx.org; helo=ciao.gmane.io X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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:263429 Archived-At: On Mon 25 Jan 2021, Stefan Monnier wrote: > I don't have a strong opinion over using worktrees or submodules or > what, but I think we should first clarify whether we intend to bundle > *all* GNU ELPA packages or only some of them. > > And then whether we want to keep the code (for those GNU ELPA packages > we want to bundle) exclusively in elpa.git. > > I think we'll only want to bundle a few specific packages, and I think > it might be simpler to keep a copy of those specific packages in > emacs.git (in the form of branches, of course: we want to be able to > easily sync those copies with the ones in elpa.git). I agree that only keeping copies of packages that are actually bundled with emacs is preferable. > One advantage is that cloning emacs.git would get us all the data we > need (no need to refer to some other Git repository). > Another is that this will only get the subset of GNU ELPA which we > intend to bundle, so its size won't grow quite like that of `elpa.git`. > Also it naturally gives us separate release branches that can evolve > at a slightly different rate than the code in elpa.git, without having > to touch elpa.git itself. Another possibility is git subtrees: https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt This keeps a copy of the files from a project plus enough metadata to allow normal commits in the subtree and merging changes back into their upstream origin. However a downside I have observed with a repo using git subtree is that 'git log' is not yet clever enough to follow the history of files in the subtree properly (although 'git blame' works). AndyM