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: Tue, 17 Jan 2017 22:06:41 +0100 Message-ID: <87vatdv1jy.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> <874m0ywvxa.fsf@engster.org> <9787CBF8-9449-4EE6-B3E3-72781A9D0861@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1484687258 29908 195.159.176.226 (17 Jan 2017 21:07:38 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 17 Jan 2017 21:07:38 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) Cc: Eli Zaretskii , emacs-devel@gnu.org To: Edward Steere Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 17 22:07:33 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 1cTayZ-00073d-Jp for ged-emacs-devel@m.gmane.org; Tue, 17 Jan 2017 22:07:31 +0100 Original-Received: from localhost ([::1]:37689 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTayc-0002oi-Rs for ged-emacs-devel@m.gmane.org; Tue, 17 Jan 2017 16:07:34 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTay3-0002oa-MI for emacs-devel@gnu.org; Tue, 17 Jan 2017 16:07:00 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cTay1-0003SB-2J for emacs-devel@gnu.org; Tue, 17 Jan 2017 16:06:59 -0500 Original-Received: from randomsample.de ([5.45.97.173]:38148) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cTay0-0003O6-OL; Tue, 17 Jan 2017 16:06:56 -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=vE+itHBU7F8A77H2OOp2D+nU9AWV62jg+IRAHWCpj6E=; b=rL4+O63AbEDN2+l3yKXIXsHWK8c2oObnLSE7rPUKewY4LECSQ/9uBsyKOBcFxwRCWNs1Dm8a7wwItqNHEc01dund3HzGhl5Za0ldyfBZh2Zyv844aRAMhVC6KxYdFy57; 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 1cTaxt-0008Tn-1R; Tue, 17 Jan 2017 22:06:49 +0100 In-Reply-To: <9787CBF8-9449-4EE6-B3E3-72781A9D0861@gmail.com> (Edward Steere's message of "Tue, 17 Jan 2017 07:21:52 +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:211358 Archived-At: Edward Steere writes: > Alright. It shouldn't be too difficult to merge with the commit > history intact and I agree wrt the tests so I'll make a start of > porting those tonight. That's great, thanks. You will need to remove quite some stuff from there that is not in Emacs, like everything Java related, the Fortran tests, ede/arduino, cogre... I did take a look, and the last proper merge was done on Nov 10, 2014. I think that was right before we switched to git. I also see now that I did the merges differently than I remembered: I had an 'emacs' branch in the CEDET repository which mimicked the file system layout from Emacs, and merged the new CEDET commits there. Then I made one final diff and committed that to Emacs. So in the end, the Emacs->CEDET merged were commit-based, but CEDET->Emacs merges were done as one commit, and I dimly remember that Stefan was OK with that as long as we provided proper ChangeLogs. So I think it would be OK to do it this way again. > Wrt the files which are in upstream but not in core do you have any > experience with what ought to be merged? Looking at the changes since Nov 10, 2014, there's the new ede/compdb package. Otherwise, most of the changes are for Semantic and EDE, and they are mostly by Eric and me, and it is not as much as I feared. > There are newly supported project types and databases which look like > they should probably be merged, but there are still more sources. If > not all of it is appropriate for the merge then perhaps we could look > at moving future development to one or many ELPA packages. For now, new files should be ignored if possible, let's merge the core files first. Then anybody can look at what else is still upstream and create ELPA packages for it. If you work on the test suite, I will try to merge the commits since Nov 2014. -David