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:23:59 +0100 Message-ID: <87k29tv0r4.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> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1484688270 30732 195.159.176.226 (17 Jan 2017 21:24:30 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 17 Jan 2017 21:24:30 +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 Tue Jan 17 22:24:21 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 1cTbEj-0006ea-Re for ged-emacs-devel@m.gmane.org; Tue, 17 Jan 2017 22:24:13 +0100 Original-Received: from localhost ([::1]:37756 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTbEo-0006AJ-AH for ged-emacs-devel@m.gmane.org; Tue, 17 Jan 2017 16:24:18 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39242) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTbEd-00068V-QI for emacs-devel@gnu.org; Tue, 17 Jan 2017 16:24:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cTbEZ-0005ju-MA for emacs-devel@gnu.org; Tue, 17 Jan 2017 16:24:07 -0500 Original-Received: from randomsample.de ([5.45.97.173]:38427) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cTbEZ-0005iQ-Cd; Tue, 17 Jan 2017 16:24:03 -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=KyOcp6vs1buY4wdFWb0gTQxpYPQxmViI/4wselV6cdI=; b=NmuikybZrsFL6qJccCthp2CTWuEQgKrAqwBXqJLEDcnxhRRLaRihTNAodg24Sv5dFnEeBWmhD/mzLTuvwJ/1PRrw711Il8dekYe64pmb0LxWnjGMfjm5x6tiSypTrQEq; 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 1cTbEX-00035y-3Z; Tue, 17 Jan 2017 22:24:01 +0100 In-Reply-To: <8737gh5sqw.fsf@gmail.com> (Edward John Steere's message of "Tue, 17 Jan 2017 22:36:07 +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:211362 Archived-At: Edward John Steere writes: > 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. Merging to the CEDET repo is not needed, since we will abandon it anyway. > 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. I think it will be less work to simply do the diff|patch game and fixing a few paths along the way. Since the histories are unrelated, git cannot really help you with the merges anyway. > (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.) I wouldn't worry too much about the history of the tests. The authorship of the changes should be clear, but at least I don't care much for granularity here. -David