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: ELPA commit freeze Date: Tue, 20 Aug 2013 01:16:57 -0400 Message-ID: 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 X-Trace: ger.gmane.org 1376975838 3403 80.91.229.3 (20 Aug 2013 05:17:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 20 Aug 2013 05:17:18 +0000 (UTC) Cc: emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Aug 20 07:17:19 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 1VBeJi-0004G8-Vf for ged-emacs-devel@m.gmane.org; Tue, 20 Aug 2013 07:17:19 +0200 Original-Received: from localhost ([::1]:45993 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBeJh-0003Vj-TT for ged-emacs-devel@m.gmane.org; Tue, 20 Aug 2013 01:17:17 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47090) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBeJW-0003VY-KF for emacs-devel@gnu.org; Tue, 20 Aug 2013 01:17:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VBeJP-0006FY-AU for emacs-devel@gnu.org; Tue, 20 Aug 2013 01:17:06 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:37391) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBeJP-0006FQ-6J for emacs-devel@gnu.org; Tue, 20 Aug 2013 01:16:59 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av4EABK/CFHO+LNT/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLDiYSFBgNJIgeBrEfkA6ND4N7A6R6gV6DE4FT X-IPAS-Result: Av4EABK/CFHO+LNT/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLDiYSFBgNJIgeBrEfkA6ND4N7A6R6gV6DE4FT X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="22578168" Original-Received: from 206-248-179-83.dsl.teksavvy.com (HELO fmsmemgm.homelinux.net) ([206.248.179.83]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 20 Aug 2013 01:16:51 -0400 Original-Received: by fmsmemgm.homelinux.net (Postfix, from userid 20848) id F1B87AE0CA; Tue, 20 Aug 2013 01:16:57 -0400 (EDT) In-Reply-To: <5211BBC8.40408@yandex.ru> (Dmitry Gutov's message of "Mon, 19 Aug 2013 09:31:36 +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:162903 Archived-At: > 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'. > 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". 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. 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. > 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. Stefan