From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Git version of ELPA Date: Mon, 12 Aug 2013 11:24:27 -0400 Message-ID: References: <8738qs5qrg.fsf@igel.home> <87mwoz4w4f.fsf@igel.home> <877gfrrida.fsf@yandex.ru> <52087DDD.1020100@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1376321112 23109 80.91.229.3 (12 Aug 2013 15:25:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 12 Aug 2013 15:25:12 +0000 (UTC) Cc: Andreas Schwab , emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Aug 12 17:25:15 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 1V8tze-0006aC-5g for ged-emacs-devel@m.gmane.org; Mon, 12 Aug 2013 17:25:14 +0200 Original-Received: from localhost ([::1]:55419 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V8tzd-0007fL-KK for ged-emacs-devel@m.gmane.org; Mon, 12 Aug 2013 11:25:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58339) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V8tz4-0006oY-IF for emacs-devel@gnu.org; Mon, 12 Aug 2013 11:24:43 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V8tyu-00055C-Lh for emacs-devel@gnu.org; Mon, 12 Aug 2013 11:24:38 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:14899) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V8tyu-00054J-Fj for emacs-devel@gnu.org; Mon, 12 Aug 2013 11:24:28 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av8EABK/CFFLd/Nq/2dsb2JhbABEvw4Xc4IeAQEBAQIBAQJTIwULCw4mEhQUBA0kLIdyBgzBIZEKA5Nfg0qNUYFegxM X-IPAS-Result: Av8EABK/CFFLd/Nq/2dsb2JhbABEvw4Xc4IeAQEBAQIBAQJTIwULCw4mEhQUBA0kLIdyBgzBIZEKA5Nfg0qNUYFegxM X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="21501622" Original-Received: from 75-119-243-106.dsl.teksavvy.com (HELO pastel.home) ([75.119.243.106]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 12 Aug 2013 11:24:20 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 2AF2B62FC1; Mon, 12 Aug 2013 11:24:27 -0400 (EDT) In-Reply-To: <52087DDD.1020100@yandex.ru> (Dmitry Gutov's message of "Mon, 12 Aug 2013 09:17:01 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.182 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:162619 Archived-At: > 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? Haven't tested any of them, since neither of them is supported by the current Bazaar setup: it can't be worse than what we have in this respect. >> 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. That would be nice. I did not insist on it, because my tests showed that you can "subtree merge" an external branch after-the-fact: with Bazaar this resulted in serious problems, whereas with Git this is handled sanely (not as well as having the external branch merged right from the start, of course, but good enough). > 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. The `elpa' code will always tend to include local changes. Less is better, but they're a fact of life. > For example, just compare > http://repo.or.cz/w/emacs.git/tree/dbb5d60608ae6b99910b0c374f82b63fde526abf:/packages/yasnippet > and > https://github.com/capitaomorte/yasnippet/ yasnippet is a problem, indeed. Someone needs to sync up the two trees (and take responsibility to keep them in sync in the future). Stefan