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: ELPA commit freeze Date: Wed, 21 Aug 2013 02:22:04 +0300 Message-ID: <5213FA1C.3080700@yandex.ru> References: <871u5w1tpy.fsf@yandex.ru> <520FA630.8080003@yandex.ru> <5211BBC8.40408@yandex.ru> <52133662.1000900@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 1377040961 6996 80.91.229.3 (20 Aug 2013 23:22:41 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 20 Aug 2013 23:22:41 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 21 01:22:44 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 1VBvG8-00037B-H5 for ged-emacs-devel@m.gmane.org; Wed, 21 Aug 2013 01:22:44 +0200 Original-Received: from localhost ([::1]:50653 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBvG8-0006l3-3y for ged-emacs-devel@m.gmane.org; Tue, 20 Aug 2013 19:22:44 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58827) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBvFl-0006RE-9S for emacs-devel@gnu.org; Tue, 20 Aug 2013 19:22:41 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VBvFZ-0003fr-SY for emacs-devel@gnu.org; Tue, 20 Aug 2013 19:22:21 -0400 Original-Received: from mail-wg0-x230.google.com ([2a00:1450:400c:c00::230]:63795) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBvFZ-0003fS-Ib for emacs-devel@gnu.org; Tue, 20 Aug 2013 19:22:09 -0400 Original-Received: by mail-wg0-f48.google.com with SMTP id f12so891769wgh.3 for ; Tue, 20 Aug 2013 16:22:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=ZY3ANfQg/Gn17w2JGi7RaWV0gQPeCn8Pje3MBb/V4W8=; b=FVLWG9OxI5DSHJ5nYJSrV+lfMB1/5PXeP7Z//BAah6FkCWMo8U26+udmA0H4p9RPN7 YjWf1v3W6r7h8bLHezf2iWxHZ4lxA+hz6Ran+vfeq6UwkME5FW0MQXFRcQ5omrpUyhqv ki2V75Rc/+LVukA9mhPlt/gF47BgPXV5zwH8N+jimxpfSgm1nJ+/0VHc8MNfYqnKXVS7 OY7dQ1EpJFQKOygTst3DRQJY7kqBYrnFC/I0XsGQsWAspz9KEA9Sa82PjTclT5cE9yA7 VEYofFvvOCekYgSmEGow0aZN1RFk7dCuDHTvplrbpk8pSoxv+NTvv6f331u7FlywnJ8N zxrg== X-Received: by 10.180.104.73 with SMTP id gc9mr3129534wib.13.1377040928645; Tue, 20 Aug 2013 16:22:08 -0700 (PDT) Original-Received: from [192.168.10.2] (62-107-247.netrun.cytanet.com.cy. [62.228.107.247]) by mx.google.com with ESMTPSA id l7sm27382086wiw.4.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 20 Aug 2013 16:22:07 -0700 (PDT) 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: 2a00:1450:400c:c00::230 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:162938 Archived-At: On 20.08.2013 17:45, Stefan Monnier wrote: >> So we could check out the version before externals were introduces, erase >> all their respective directories, then apply all commits made to the >> "administrative" part of the tree, and then add the subtrees properly. Some >> cleanup commits would have to be re-applied, but there's not a lot of them. > > We could try to do that. I'm far form convinced it's worth the trouble. Yep, I've tried that, and some of the subtree merges were done quite a while ago, e.g. coffee-mode. Maybe it's indeed not worth the trouble. >> If it's too late, I suppose we can live with that, but this way we a) give >> up an easy way to sync back, b) accept that we'll see each non-upstream >> commit in externally maintained packages's histories twice: once for when >> it's made, second after it's cherry-picked, committed to upstream and then >> merged back into elpa. > > Not that "git subtree push" also duplicates the commits. It just > automates the process. So, it's only a) that's lost. Yes, I should've checked. So, if git-subtree does not include any additional conflict-resolving functionality, I guess sending commits from elpa to relevant upstreams by email should be close enough. I guess the main drawback left is if anyone else looks at the description of how elpa is organized, thinks "git subtree!", and spends time trying to make it work properly. That aside, could you look at the following emails? I sent them via Yandex's SMTP server accidentally and, as usual, they were bounced back from perlin.IRO.UMontreal.CA by timeout. http://lists.gnu.org/archive/html/emacs-devel/2013-08/msg00521.html http://lists.gnu.org/archive/html/emacs-devel/2013-08/msg00522.html