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: Tue, 17 Jan 2017 22:36:07 +0200 Message-ID: <8737gh5sqw.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> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1484685409 5043 195.159.176.226 (17 Jan 2017 20:36:49 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 17 Jan 2017 20:36:49 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) Cc: Eli Zaretskii , emacs-devel@gnu.org To: Stephen Leake Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 17 21:36:44 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 1cTaUe-0000Mg-O0 for ged-emacs-devel@m.gmane.org; Tue, 17 Jan 2017 21:36:36 +0100 Original-Received: from localhost ([::1]:37572 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTaUj-0005GQ-MA for ged-emacs-devel@m.gmane.org; Tue, 17 Jan 2017 15:36:41 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTaUd-0005GK-EC for emacs-devel@gnu.org; Tue, 17 Jan 2017 15:36:36 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cTaUZ-0008I7-7i for emacs-devel@gnu.org; Tue, 17 Jan 2017 15:36:35 -0500 Original-Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:35663) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cTaUZ-0008Gg-1s; Tue, 17 Jan 2017 15:36:31 -0500 Original-Received: by mail-wm0-x244.google.com with SMTP id d140so24881912wmd.2; Tue, 17 Jan 2017 12:36:29 -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=ORkmA3UT6ce3Ti9L8GtiA/PAtKt1zVN06uyEyIdPqtw=; b=jvNitH4gfnh3hBFIS2YIBFX+tsGVrK/DppUXLfm+HpjbFl1ElM3F9U2DYhJ0GEsLZT EY6Vii0D3aCdTO5gA6tBfFHqAnj0ZjstQpyfbaOnOSV4Jqqm9Ya8vbdci94WduvpcY4l 8DmHCjaN/meTn6/tdAO7QQnfMPJJ18ptNsnK5cothPewTXPdLEOqCUNRYWHXfmWr+gJB xoKCXi3phO704NO1kGQoPkcQk6UiicO5PR53AqK0GhvG1HQ28nlEYJ1rlVV2jfakG6wn 2uUPveMcTCsdJDGyrZt0ZSmjHUoxLbPgxZJXOjz7lXkp0kZGaYa8m7SeD7FimEDJmy0/ kqDQ== 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=ORkmA3UT6ce3Ti9L8GtiA/PAtKt1zVN06uyEyIdPqtw=; b=ejlmISlkHJ4JWWrfgIKdg6hfTxt7xbUXiRwH9qVIgrDW87gKQ09V15TtOE+7jIn+MX yU90lO/pbSUA/twjMJbG3W6NUETELNQSioyRtKgT9TiX18WorEo5SGtJwd/OwnmrAej2 t29Cd4a8sGQ6DbnFuYDOQrde+s3FQIn36PrNb3HwBDxr625MJ/W59en81Fw8X/OLARkS i6KjBVBiIN6sTjmaM4PdfQe7emghhCv+NbZhwKYqKgPXyKFcx27NjdP/FX2XZy7D5rhy FY+Lwf5c5ewQmQevqg+TymuRnxsm0VZ8CAzsXMtBBmutj12Tx3UNLLTbzTX99pnTpsCp onkQ== X-Gm-Message-State: AIkVDXISZsBS934ydAfmExrQ7VCdgTePCRtXd0go4T26ysVtCDpqQMjrqXidyARPb/sDBw== X-Received: by 10.223.128.226 with SMTP id 89mr33426187wrl.130.1484685388435; Tue, 17 Jan 2017 12:36:28 -0800 (PST) Original-Received: from edward ([41.193.194.172]) by smtp.gmail.com with ESMTPSA id y127sm39395527wmg.12.2017.01.17.12.36.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jan 2017 12:36:27 -0800 (PST) In-Reply-To: <8660ldabje.fsf@stephe-leake.org> (Stephen Leake's message of "Tue, 17 Jan 2017 10:36:37 -0600") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::244 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:211357 Archived-At: > I'd like to help with this. Perhaps doing some of the merge work, or by > running tests; let me know. Hi Stephe, Great! I could use all the help I can get :-) Our main concern is to maintain the commit history and I think that my original approach of merging to CEDET and then back creates too much noise. So I'm now considering a new approach and would value your involvement if we can work out the details. I think that the best way to go about this is to move everything in the CEDET project into folders which mirror their destination in core. Changes will be required for: - The grammar files, which need to be in admin/grammars - The tests, which need to be in test/manual/cedet - The documentation files, which need to move to doc/misc (and should probably be flattened.) Once moved we commit, add CEDET as a remote of Emacs and merge CEDET/master allowing unrelated histories. We can delete any files which fall outside of: - admin/grammars - test/manual/cedet - lisp/cedet - doc/misc We should also delete any added Makefiles, EDE project files and bash scripts. This brings us to the topic of collaborating on this change. I'm not aware of any strategy for merging which allows for collaboration; so I've come up with the following hack (comments/adjustments welcome): 1. create a staging repository for CEDET and make the requisite folder structure changes in it 2. create a branch in the Emacs project and merge allowing unrelated histories 3. delete any files outside of our target folders and commit with unresolved conflicts 4. push up the branch and divvy out files/folders for fixing conflicts 5. commit and push as we go If this sounds like something you'd like to be involved in then I'll start with steps 1.->3. and follow up when I'm done. If anyone has a better idea then I'm listening. (I considered moving the tests, but they have history too and we'd have to start splitting commits to get them across w/o the rest of upstream CEDET. Additionally there's nothing preventing the tests from being run with CEDET in Emacs core. Just start it with --no-init add the test folder to the load path, load the relevant test file and run it.) Kind regards, Edward Steere