From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: CEDET Merge Date: Mon, 16 Jan 2017 22:13:05 +0100 Message-ID: <874m0ywvxa.fsf@engster.org> References: <87r348ul9n.fsf@gmail.com> <87lgugm2qg.fsf@gmail.com> <87inpelu8i.fsf@gmail.com> <837f5uajlk.fsf@gnu.org> <87a8aqlqz8.fsf@gmail.com> <878tqawy2k.fsf@engster.org> <871sw2lp1i.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1484603124 14370 195.159.176.226 (16 Jan 2017 21:45:24 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 16 Jan 2017 21:45:24 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) Cc: Eli Zaretskii , emacs-devel@gnu.org To: Edward John Steere Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 16 22:45:20 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cTF5L-00023X-CX for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2017 22:45:03 +0100 Original-Received: from localhost ([::1]:59809 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTF5Q-000760-3k for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2017 16:45:08 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTEaW-00056V-F1 for emacs-devel@gnu.org; Mon, 16 Jan 2017 16:13:13 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cTEaT-0001M8-7W for emacs-devel@gnu.org; Mon, 16 Jan 2017 16:13:12 -0500 Original-Received: from randomsample.de ([5.45.97.173]:42980) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cTEaS-0001Ls-Tq; Mon, 16 Jan 2017 16:13:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=1SsTgj4b6DSdt0iApTbmyeoPOtsSRyRBS3gBamRg+n0=; b=mjRmBPyFoH+Sv9lbRP9fhAqvaF0KftQVYTl1Np7v3KfvT9Xmocr6guGtEg83UVkl1wClP5D03u54fId37LxepKv/5mKuG9M06+aZUK1bGNAuf9DFUwu1yUajp92W0s49; Original-Received: from ip4d16b353.dynamic.kabel-deutschland.de ([77.22.179.83] helo=isaac) by randomsample.de with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1cTEaR-0006kO-0x; Mon, 16 Jan 2017 22:13:07 +0100 In-Reply-To: <871sw2lp1i.fsf@gmail.com> (Edward John Steere's message of "Mon, 16 Jan 2017 22:37:13 +0200") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 5.45.97.173 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:211337 Archived-At: Edward John Steere writes: >> No, please do not merge Cogre. It is not a new module, was never part of >> Emacs and is not really actively developed anymore. >> >> -David > > Sure. > > The plan is to start by getting the whole of Cedet compiling and > starting up in core and then taking a more deliberate approach to what > stays and goes. I'm taking this approach because the alternatives > require a bit more historic knowledge of Cedet than I have. > > Are you aware of a better approach? The problem with this approach is that you loose lots of history for the changes that are applied. In Emacs this is especially problematic because of the copyright issues. So one will need at least a proper ChangeLog, saying which authors changed which functions, but the Emacs maintainers will have to say if that would suffice of if we need authorship information for each line that is applied. So the "Right Way" would be to apply the upstream commits that happened since the last CEDET merge to the Emacs repo. I had a package for doing that, but it was based on Bazaar, so that went they way of the Dodo. It's called cedet-emacs-merge.el and is in the CEDET repo. I don't think it makes sense to port it to git, because we actually agreed some time ago to drop the CEDET repo altogether, so we would "only" need one final one-way merge. It's been on my TODO list for ages, and I'm really sorry that it still has not happened yet. In my opinion, the first thing that should be done is to port the test suite to Emacs, meaning the unit and integration tests for Semantic and EDE, ripping out all tests for stuff that is not in Emacs. I already did that for EIEIO, but for Semantic and EDE a lot is missing. It will make it much easier to find regressions while doing the merge. -David