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: Fri, 27 Jan 2017 22:04:17 +0100 Message-ID: <874m0k1age.fsf@engster.org> References: <87r348ul9n.fsf@gmail.com> <87lgugm2qg.fsf@gmail.com> <87inpelu8i.fsf@gmail.com> <837f5uajlk.fsf@gnu.org> <87a8aqlqz8.fsf@gmail.com> <8360leahxr.fsf@gnu.org> <8760lelq68.fsf@gmail.com> <83wpdt8yo2.fsf@gnu.org> <87inpd650y.fsf@gmail.com> <8660ldabje.fsf@stephe-leake.org> <8737gh5sqw.fsf@gmail.com> <87k29tv0r4.fsf@engster.org> <8737gguipm.fsf@engster.org> <87h94vdj3n.fsf@gmail.com> <87o9z2sog1.fsf@engster.org> <87d1fe3hof.fsf@engster.org> <87lgtwtfuc.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1485551109 23762 195.159.176.226 (27 Jan 2017 21:05:09 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 27 Jan 2017 21:05:09 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) Cc: Eli Zaretskii , Stephen Leake , emacs-devel@gnu.org To: Edward John Steere Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 27 22:05:04 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 1cXDhe-0005Z4-UQ for ged-emacs-devel@m.gmane.org; Fri, 27 Jan 2017 22:05:03 +0100 Original-Received: from localhost ([::1]:48892 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cXDhi-0005kd-Qt for ged-emacs-devel@m.gmane.org; Fri, 27 Jan 2017 16:05:06 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58562) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cXDh3-0005kY-L2 for emacs-devel@gnu.org; Fri, 27 Jan 2017 16:04:26 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cXDgy-0003Pv-OP for emacs-devel@gnu.org; Fri, 27 Jan 2017 16:04:25 -0500 Original-Received: from randomsample.de ([5.45.97.173]:39390) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cXDgy-0003Od-Et; Fri, 27 Jan 2017 16:04:20 -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=ckvVgM5ddCqAWAAwOhmuu5TVPP/Ktu+oH3iNJAJrbnQ=; b=aiylEpc+oqez59xMSJp0AE6YiHNRTFgRfsu63VvUw/Z4rdituHP/87fn6q5TvdxdaDLg+Nda3meUi0V6P4xNMf7lbBSiSAJTYVO4aYeyTVafmX0k8Is9g9/JE1QvYUh/; 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 1cXDgw-0007B5-6Z; Fri, 27 Jan 2017 22:04:18 +0100 In-Reply-To: <87lgtwtfuc.fsf@gmail.com> (Edward John Steere's message of "Fri, 27 Jan 2017 22:20:27 +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:211661 Archived-At: Edward John Steere writes: > David Engster writes: >>> Edward John Steere writes: >>>> As I said in my previous email I'll make a start on the tests. >>> >>> That's great, thanks! I'll push a branch with my progress soon. >> >> I just pushed my first try as scratch/last-cedet-merge. >> >> -David > > I've just pushed up a fairly rough attempt at merging the tests in > scratch/merge-cedet-tests Thank you. > (it looks like tests were only ever merged to Emacs once.) Yes. > I took the following approach: > > * I used git to format patches per test file. > * changed the destination of the file in each patch to match the Emacs > manual testing directory; > * fixed any commit messages which failed the commit hook; > * added a final commit to cleanup; which included the removal of > duplicated test files not moved by the patching process and the > removal of dependencies on language/project support which we're not > merging > > The consequence of this approach is that my branch will add 316 commits. > Many of the commit messages aren't up to scratch (they pass the commit > hook but don't match the requirements outlined in CONTRIBUTE). I'm > going to have to spend some time fixing the rest of the commits. I > wanted to ask whether we should consider squashing all 316 commits into > a "cedet-merge" commit since the changes are going to be documented in > the ChangeLog. There seems to be a misunderstanding here: The ChangeLog is generated from the commit log and not written separately anymore. I don't think it makes sense to fix up all the commits messages. The commits you've merged go back to the beginning of CEDET, and I don't think there's any sense it writing proper ChangeLogs for them now. They are only tests, after all. However, it is very good that we have the history on your branch, because it makes it much easier to check if all authors have signed papers (last I asked, authors of non-trivial tests were also required to have papers signed with the FSF). In my opinion, once we have decided which tests to keep and fixed them, we should squash them and commit it as a new test suite. > Finally; the tests don't run with the CEDET in Emacs. That's totally expected. I'll take a look at them. -David