From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Edward Steere Newsgroups: gmane.emacs.devel Subject: Re: CEDET Merge Date: Wed, 18 Jan 2017 12:12:10 +0200 Message-ID: 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> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 (1.0) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1484734364 29942 195.159.176.226 (18 Jan 2017 10:12:44 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 18 Jan 2017 10:12:44 +0000 (UTC) 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 Wed Jan 18 11:12:39 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 1cTnE7-000683-IL for ged-emacs-devel@m.gmane.org; Wed, 18 Jan 2017 11:12:23 +0100 Original-Received: from localhost ([::1]:40349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTnEC-0007Kt-DJ for ged-emacs-devel@m.gmane.org; Wed, 18 Jan 2017 05:12:28 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37176) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTnE4-0007K3-9m for emacs-devel@gnu.org; Wed, 18 Jan 2017 05:12:21 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cTnE3-0001Nc-EG for emacs-devel@gnu.org; Wed, 18 Jan 2017 05:12:20 -0500 Original-Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]:35257) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cTnDy-0001MM-OG; Wed, 18 Jan 2017 05:12:14 -0500 Original-Received: by mail-lf0-x243.google.com with SMTP id v186so1028930lfa.2; Wed, 18 Jan 2017 02:12:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=ocLVRavVd/vcQIDvYA7EaNlNUY9N4MTdX3GWPzQ0u8w=; b=tza3k538nP0lln+/oUeIdjiMlZy//mmbq7FtC0fr2TigXzKDiT5MV62N1zwsR15B14 IGX+ZUmN4Tq6k7rql6ETvSHmzSde3zv6KpR+Ir9+lA9DI9qtNprXRxTeZcHTDwv+ai4U ohF9PnZdUadctwNF2tJKXikXtsY6+gu6vG5Kng9NjxqtIWYoD1jBMj1I9t7rUehBbdjq suxLLZCBxjGPGQ0RYZYxIaY9MubhDwyWbcR1jrY5QUImjB9MpOTBqhYXObTjLZH/5Fem QV9A8dcg6UKAMlfrCKCDOPmNXL3GNF6LczbZEdNeOaIDKwKwMB8CtsnP5r7ssSOP415s jV5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=ocLVRavVd/vcQIDvYA7EaNlNUY9N4MTdX3GWPzQ0u8w=; b=bpSRxF9zXyX5MsEvVt26rfrWtoHlYPqoUNrLQSs5jCnhJ3mOekQZZJ+fCu8rLn/CHx kVW6NfVrwgGqYXIekXJ1QOyYIQkGmXphPjfwvO0DeFHu+FU24NOVBgnd9nj/I+t819ek uVahzL9mUMY8F3LAYWo9toQKaZbmugetXn+R52nIdutR/TOQWWZb48f3WY/AE1+VyWkA 0nMxQQ95d7WUKYuDd/nlyzY0cbZxi9wflyHt3C5sdBspU6LaUzX4hjg1h21+n+nSZtQZ vf/Z2ftKYR2hx0hCC5Tc06BhQW8Ip3bGvkOpBLCftqLupUPlInDI32YJ+5fy3E+BjKHa Xz6w== X-Gm-Message-State: AIkVDXKQBybZV2oIyHKfGD/kbsOhv5UvsiK6FziHWwfYgECwWV12zohWXfBpzk2j469ulQ== X-Received: by 10.25.22.104 with SMTP id m101mr786118lfi.17.1484734333293; Wed, 18 Jan 2017 02:12:13 -0800 (PST) Original-Received: from [10.177.123.253] ([105.5.129.86]) by smtp.gmail.com with ESMTPSA id 17sm6423150ljp.45.2017.01.18.02.12.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Jan 2017 02:12:12 -0800 (PST) X-Mailer: iPhone Mail (14C92) In-Reply-To: <87k29tv0r4.fsf@engster.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::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:211373 Archived-At: Patching does sound easier. Given that we might be moving from upstream entirely it might be worth it to= keep the commit history if we can though. I know that git won't make is ea= sy. If we do go with patching though, and the changes are going to appear in the= changelog then how are we going to go about doing that? Would we use the a= dd-change-log command on all of the commits since the last merge? One disadvantage of all of this is that git blame results would be more diff= icult to interpret because the change and author would be documented elsewhe= re. > On 17 Jan 2017, at 11:23 PM, David Engster wrote: >=20 > 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. >=20 > Merging to the CEDET repo is not needed, since we will abandon it > anyway. >=20 >> 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.) >>=20 >> Once moved we commit, add CEDET as a remote of Emacs and merge >> CEDET/master allowing unrelated histories. >=20 > 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. >=20 >> (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.) >=20 > 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. >=20 > -David