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: Tue, 20 Aug 2013 12:26:58 +0300 Message-ID: <52133662.1000900@yandex.ru> References: <871u5w1tpy.fsf@yandex.ru> <520FA630.8080003@yandex.ru> <5211BBC8.40408@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 1376990875 25176 80.91.229.3 (20 Aug 2013 09:27:55 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 20 Aug 2013 09:27:55 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Aug 20 11:27:57 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 1VBiEG-0007dU-7D for ged-emacs-devel@m.gmane.org; Tue, 20 Aug 2013 11:27:56 +0200 Original-Received: from localhost ([::1]:46781 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBiEF-0006lk-LV for ged-emacs-devel@m.gmane.org; Tue, 20 Aug 2013 05:27:55 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBiDV-0005we-Ny for emacs-devel@gnu.org; Tue, 20 Aug 2013 05:27:14 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VBiDR-0004sO-5p for emacs-devel@gnu.org; Tue, 20 Aug 2013 05:27:09 -0400 Original-Received: from mail-ea0-x22b.google.com ([2a00:1450:4013:c01::22b]:65504) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBiDQ-0004sE-VX for emacs-devel@gnu.org; Tue, 20 Aug 2013 05:27:05 -0400 Original-Received: by mail-ea0-f171.google.com with SMTP id n15so89930ead.2 for ; Tue, 20 Aug 2013 02:27:04 -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=KY+KPqJg2akivl+Hw+L6vbngDn/fjzE0rU2kwa649zY=; b=fYb4ytRF7Oph2wN/ll5Hnp4un8CQfQXe1beJtpvuB8SGXfdRrEsnZJd5dazIMHdBTB euYmIEMaqaXgrgQDQQ5yKxOYuL07k/CfV0QhNM7BffsH4ZFYQl+oj1tdFP0MwRU4OPG9 FXTYIJzNHGX2/h/ZQ/Nkih/JBocsXAN8sdY3/jpaHt8O17wdBQyg1IbKrup0IKvKDY3j Dzirjo0yZLYcCoklH9w1XRucrhIwOsGYysAJamBZf03FQnoeLzaSSc11qqGsS15UtdoT IGZRUHWVDcTdHhEmrucXtK3NsfrDQfjTK0LkknXO5M4jBEbt+iIeLFLmEf4EV6gOoclg J9iw== X-Received: by 10.14.122.69 with SMTP id s45mr924543eeh.58.1376990823833; Tue, 20 Aug 2013 02:27:03 -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 n48sm964313eeg.17.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 20 Aug 2013 02:27:03 -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:4013:c01::22b 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:162910 Archived-At: On 20.08.2013 08:16, Stefan Monnier wrote: >> The packages/js2-mode subtree history is wrong, > > That's for sure: it pretends that all changes until the conversion to > Git happened directly in `elpa'. Aside from that, git log -- packages/js2-mode doesn't show the commits from the upstream repo at all, only the merge commit. Can you explain that? I remember that Bzr somehow omits histories of the merged branches (by default?), but 'git log' usually shows all commits that ended up in the current branch history. >> so the wrong history got pushed. > > I'd expect this history to be "the true js2-mode history plus > a redundant copy of that history from the packages/js-2mode directory of > the Bzr branch". Is that the case, or do you get "the true js-2mode > history plus the complete history of the whole elpa branch". Something along the lines of the latter. Here's what the push contained: https://github.com/mooz/js2-mode/compare/2c27e3eb847c...05424b8245b6 (the view is limited to 250 commits, but there were obviously more of them). 2c27e3eb847c is the current upstream HEAD. And here's the report from the automatic build on Travis-CI: https://travis-ci.org/mooz/js2-mode/builds/10312341 After checking out the new version, it couldn't find .travis.yml, because the tree contained the whole elpa: https://github.com/mooz/js2-mode/tree/05424b8245b62e95e2b376cbc63ed182cb1c8bee > In the case of a "duplicate history", I think it's about as good as it's > going to get, because of the fact that the "subtree merge" was only made > at the end. Do you think it's too late to rewrite history? Apparently, git filter-branch allows to remove a directory from history. 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. 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. > To get something better, we'd have to reconstruct the elpa > branch bit by bit, performing the merges as if they'd been done right > back when we added/updated all those externally maintained branches. I'm not sure which merges you mean, but the way I described we'd give up older changes from before conversion to Git, that still aren't merged into upstreams now. >> You did. See 293db6e (Fix up copyrights and the checking code). > > I think this was before I fixed the email-massaging scripts to adjust to > the new format. I'll install one of my pending minor cleanups to the > js2-mode, so we can make sure it works. Ok.