From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Edward Steere Newsgroups: gmane.emacs.devel Subject: Re: CEDET Merge Date: Tue, 17 Jan 2017 07:21:52 +0200 Message-ID: <9787CBF8-9449-4EE6-B3E3-72781A9D0861@gmail.com> 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> <874m0ywvxa.fsf@engster.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 (1.0) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1484630591 3324 195.159.176.226 (17 Jan 2017 05:23:11 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 17 Jan 2017 05:23:11 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 17 06:23:06 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 1cTMEE-0006ru-It for ged-emacs-devel@m.gmane.org; Tue, 17 Jan 2017 06:22:42 +0100 Original-Received: from localhost ([::1]:32979 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTMEJ-0007Hw-1X for ged-emacs-devel@m.gmane.org; Tue, 17 Jan 2017 00:22:47 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35546) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTMDb-0007Hr-VS for emacs-devel@gnu.org; Tue, 17 Jan 2017 00:22:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cTMDb-0005eo-2u for emacs-devel@gnu.org; Tue, 17 Jan 2017 00:22:03 -0500 Original-Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:34389) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cTMDV-0005dJ-C2; Tue, 17 Jan 2017 00:21:57 -0500 Original-Received: by mail-wm0-x242.google.com with SMTP id c85so3204790wmi.1; Mon, 16 Jan 2017 21:21:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=ALScsezR5WydCQowXnTgNJrxuDcCnnFZfT2gBP2l9ZU=; b=ESi0dIkdNoFZua6OcbeIiJ3qLV8aM48Osi7yOA7YeljI8maIuWsG0Nr4wpVk4ZtWQ0 pbEBw9LE5v/tXyHC7WLrsoLBaQPLmWbU9TwjOqVLKXgqYtVHmAhepGot6i3kjBY/m1+1 y6HBwANokEKz+td5/zdyxUfRWeDVapz+/AiA/yS23TaybFyHTMHpsLIaUwlGcBek+aFU S009xQVjfjZbe8cvsylU7Qgz3IILlyiUqWAn5FP5tVSVADyuiow6w15T9FJIq2Zr4jl4 n7GnCS1a3hwgXUOzNwDGUM17ETG0Je1ntzLkMJSF5rYiA3CKef/Dr8IniR1qlrf5eEsl 6q9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=ALScsezR5WydCQowXnTgNJrxuDcCnnFZfT2gBP2l9ZU=; b=p0cxiSGuq5SD9df+ZgJD/IVHAenE+9i2GjrMOeC7YTbMHP9WG92hr1FztyY0JzfYdS Eltb6xh+UZ2V2EtThL3XHrlq6Yi6k7i8baVaU8a5B7CKnGZfZ7c63B9Fvhwvn3/LLQsn saW+xShji4txtI3h8n0qKpF2FTQllbUc/klo7HN6hKaBwgDhp8aBM+JvhcyM+auMIV/M bBCaHo4yXK1nSXQ9VwvVDpvq+D9vi4nmkyjhCv5dn1DUeAu+a+diASEqyCq4XWS11vXK PVIzeIZ72EXDx20YUyXl3TVseSph3ff+vaPMAWxVi+UNdNZLKlvezsrBwgxZ4yh/TJx2 +HAQ== X-Gm-Message-State: AIkVDXJJZC9GrpqnMoP6JrMmSmnJALkV1yCDb3GusncLMtSnJE2dIywsMh7n5wID0qKQzQ== X-Received: by 10.223.139.152 with SMTP id o24mr7502499wra.122.1484630516243; Mon, 16 Jan 2017 21:21:56 -0800 (PST) Original-Received: from [10.177.123.253] ([105.5.129.86]) by smtp.gmail.com with ESMTPSA id 81sm34081857wmw.7.2017.01.16.21.21.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Jan 2017 21:21:55 -0800 (PST) X-Mailer: iPhone Mail (14C92) In-Reply-To: <874m0ywvxa.fsf@engster.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::242 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:211342 Archived-At: Sent from my iPhone > On 16 Jan 2017, at 11:13 PM, David Engster wrote: >=20 > 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. >>>=20 >>> -David >>=20 >> Sure. >>=20 >> 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. >>=20 >> Are you aware of a better approach? >=20 > 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. >=20 > 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. >=20 > 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. >=20 > -David Alright. It shouldn't be too difficult to merge with the commit history int= act and I agree wrt the tests so I'll make a start of porting those tonight.= Wrt the files which are in upstream but not in core do you have any experien= ce with what ought to be merged? There are newly supported project types an= d databases which look like they should probably be merged, but there are st= ill more sources. If not all of it is appropriate for the merge then perhap= s we could look at moving future development to one or many ELPA packages. (Apologies for the formatting, I'm writing this on my phone)=