From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Edward John Steere Newsgroups: gmane.emacs.devel Subject: Re: CEDET Merge Date: Fri, 27 Jan 2017 22:20:27 +0200 Message-ID: <87lgtwtfuc.fsf@gmail.com> 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> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1485549056 24692 195.159.176.226 (27 Jan 2017 20:30:56 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 27 Jan 2017 20:30:56 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) Cc: Eli Zaretskii , Stephen Leake , emacs-devel@gnu.org To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 27 21:30:52 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 1cXDAO-0005A3-KY for ged-emacs-devel@m.gmane.org; Fri, 27 Jan 2017 21:30:40 +0100 Original-Received: from localhost ([::1]:48771 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cXDAT-00007x-Mo for ged-emacs-devel@m.gmane.org; Fri, 27 Jan 2017 15:30:45 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46861) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cXD11-0006OR-Kg for emacs-devel@gnu.org; Fri, 27 Jan 2017 15:21:01 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cXD0y-0005Bt-BP for emacs-devel@gnu.org; Fri, 27 Jan 2017 15:20:59 -0500 Original-Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:33512) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cXD0y-0005Ad-4O; Fri, 27 Jan 2017 15:20:56 -0500 Original-Received: by mail-wm0-x243.google.com with SMTP id r144so60758176wme.0; Fri, 27 Jan 2017 12:20:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=2who4LbK5/aBq50Iv/69iPPUAxrF3n0lxJGkB+Ft1LI=; b=ZYLB0oEY9SRrjbdanuSCoa7WvKqebzq+avHjNr5KcpaeNbG1nsknDh8gtKog4BxuPJ sXmGQdKLOcsPHH+mIjIJxaqKr5+0NnvTH5kJbJv3zqbTzHtFuGuJdTzy9aIr8fw7trne STEl52S60QcdHCWoaKnShb/ZblQUuZuzKnNIXFrtxUBVFfS5RZCXMR1pyNjEuhytPLBW nc7agXOu2Xmz23QcUrYEdTZIgDhA9RQBXOkyqUCCNyd39B0hD//5kcdNtnnbmcbIgLpo FEJKjXn5P2rl0MU5UcTKbNnjrXq3EO+52MzWoY0PdjE24+bv0vNL0x3kWAiUOJRtK8UF 7fHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=2who4LbK5/aBq50Iv/69iPPUAxrF3n0lxJGkB+Ft1LI=; b=RLp0ZTzjVe+3wUCAp8sLqe+5mBacWRIBOlvy9/LDIi8XYpmjIUVjBE0NO5mOGO1mbQ dJMK/MqRjypDKwJeV+Pv+X24v6CRF/1lS0tTwqDjE3bGIYKD3DIhE4vFYNauFhSefYOg 6LcQsWQ81VPHU8RiX1//M2UOfBsO2/rrWaJpLd8/nbsPIxdBHdBp2HwayB0a1iAa/NF2 QxRCEgwP1FZOrgtxxsh743srb73Nfvp5GUQw6ehGpZTBdChMyIfy85FRNLfQ2r89BLjA oMOelfLKq9G6yeF0Bmzn4ZSjqoaB6zT3t8DgsRhSCH1ToVYRDz0SuqAZesNPV9AeC4UY +E+w== X-Gm-Message-State: AIkVDXKY0/79cDqW8oO51VV/aNRAPyINn72MLYIs0YeRT4+8hQ/P5USBk9UVtzXZQtJlBA== X-Received: by 10.28.188.9 with SMTP id m9mr4449591wmf.79.1485548453285; Fri, 27 Jan 2017 12:20:53 -0800 (PST) Original-Received: from edward ([41.193.194.172]) by smtp.gmail.com with ESMTPSA id n10sm9565695wrb.9.2017.01.27.12.20.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Jan 2017 12:20:52 -0800 (PST) In-Reply-To: <87d1fe3hof.fsf@engster.org> (David Engster's message of "Sun, 22 Jan 2017 22:31:44 +0100") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::243 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:211657 Archived-At: 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 (it looks like tests were only ever merged to Emacs once.) 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. Finally; the tests don't run with the CEDET in Emacs. The first failure is caused by a missing SRecode template -- which I imagine David will have added on his branch. I haven't checked what happens when his and my changes are merged.