From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: Git version of ELPA Date: Mon, 12 Aug 2013 09:17:01 +0300 Message-ID: <52087DDD.1020100@yandex.ru> References: <8738qs5qrg.fsf@igel.home> <87mwoz4w4f.fsf@igel.home> <877gfrrida.fsf@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1376288238 23806 80.91.229.3 (12 Aug 2013 06:17:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 12 Aug 2013 06:17:18 +0000 (UTC) Cc: Andreas Schwab , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Aug 12 08:17:21 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1V8lRQ-0004Vk-E1 for ged-emacs-devel@m.gmane.org; Mon, 12 Aug 2013 08:17:20 +0200 Original-Received: from localhost ([::1]:52096 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V8lRP-0001OO-Ef for ged-emacs-devel@m.gmane.org; Mon, 12 Aug 2013 02:17:19 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V8lRI-0001OE-Fi for emacs-devel@gnu.org; Mon, 12 Aug 2013 02:17:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V8lRD-000154-Kg for emacs-devel@gnu.org; Mon, 12 Aug 2013 02:17:12 -0400 Original-Received: from forward8l.mail.yandex.net ([2a02:6b8:0:1819::8]:33391) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V8lRD-00014p-9F for emacs-devel@gnu.org; Mon, 12 Aug 2013 02:17:07 -0400 Original-Received: from smtp4h.mail.yandex.net (smtp4h.mail.yandex.net [84.201.186.21]) by forward8l.mail.yandex.net (Yandex) with ESMTP id 24AED1A412B6; Mon, 12 Aug 2013 10:17:05 +0400 (MSK) Original-Received: from smtp4h.mail.yandex.net (localhost [127.0.0.1]) by smtp4h.mail.yandex.net (Yandex) with ESMTP id AD2092C154A; Mon, 12 Aug 2013 10:17:04 +0400 (MSK) Original-Received: from 62-107-247.netrun.cytanet.com.cy (62-107-247.netrun.cytanet.com.cy [62.228.107.247]) by smtp4h.mail.yandex.net (nwsmtp/Yandex) with ESMTP id BP5dOf5CkZ-H384I94q; Mon, 12 Aug 2013 10:17:04 +0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1376288224; bh=9cnDb/MCWu+cviyAltY162oD1nGFL+0rJEuufOb0VcY=; h=Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: References:In-Reply-To:Content-Type:Content-Transfer-Encoding; b=paal4E81HPFzs5D3i+hun87iSB0KxjnpEdQoubMjhdehhka8A/cRuXKo9dI4014RN S9U2Eyth3VLf/SB8OuLjDmsWmqsFbtQ7hzGCKjtzT5T+GWWq7/V7mch9NUo1ZYpXN4 fsYbxZMq/Bw06dbeRDxIB5Lf9+pDBY46hxHRu79s= Authentication-Results: smtp4h.mail.yandex.net; dkim=pass header.i=@yandex.ru User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130803 Thunderbird/17.0.8 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a02:6b8:0:1819::8 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:162603 Archived-At: On 12.08.2013 04:10, Stefan Monnier wrote: >> I imagine that's going to complicate the merging procedure. > > After having tried the "subtree" merging a few times, I think it'll > be manageable (and is a problem which won't recur, so I'm not too > worried). So, you've tried merging commits from upstream that include files not present in ELPA? And splitting commits from ELPA to push them to upstream repositories? And both work fine? > Of course, if there's a better Git tree available, I'll happily switch > to that one. A little while back Jorgen wrote a recipe how to do that: http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00235.html I've yet to wrap my head around this git subtree business properly, but if it helps, I can try to follow it myself, and publish the result. It raises a few questions, though. Up until now, the elpa branch has been receiving its contents in preprocessed form: 1) Some files and directories removed. 2) -pkg.el files pre-generated and included. For example, just compare http://repo.or.cz/w/emacs.git/tree/dbb5d60608ae6b99910b0c374f82b63fde526abf:/packages/yasnippet and https://github.com/capitaomorte/yasnippet/ My question is, will elpa publishing script work if packages/yasnippet contains (just) the files from the upstream repository? I imagine there'll have to be some adaptation.