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: Wed, 18 Jan 2017 23:05:57 +0100 Message-ID: <8737gguipm.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> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1484777954 9441 195.159.176.226 (18 Jan 2017 22:19:14 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 18 Jan 2017 22:19:14 +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 Steere Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 18 23:19:09 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 1cTyZD-0000n0-At for ged-emacs-devel@m.gmane.org; Wed, 18 Jan 2017 23:18:55 +0100 Original-Received: from localhost ([::1]:44700 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTyZI-000808-6Y for ged-emacs-devel@m.gmane.org; Wed, 18 Jan 2017 17:19:00 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48615) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTyMm-00085Z-Eq for emacs-devel@gnu.org; Wed, 18 Jan 2017 17:06:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cTyMj-0004wy-8m for emacs-devel@gnu.org; Wed, 18 Jan 2017 17:06:04 -0500 Original-Received: from randomsample.de ([5.45.97.173]:34269) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cTyMi-0004vd-Vl; Wed, 18 Jan 2017 17:06:01 -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=Xlmb6YsFpMdmSGcRMy9mZgfmyVLq03//cFukP85QSCk=; b=h/lGO4gzcJmD4D5xw8ZV/WCG/XNvkeSbflus30N+SXu+V+ZhZIRtghbp0uKtlJRjwkg1ohclSWWRb1LZarVIckUoAySRJDl4zTSqkT+8fsSCC1sqZVHdROvcFNkHSOeG; 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 1cTyMg-0004y3-Oy; Wed, 18 Jan 2017 23:05:58 +0100 In-Reply-To: (Edward Steere's message of "Wed, 18 Jan 2017 12:12:10 +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:211392 Archived-At: Edward Steere writes: > 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 easy. The problem with using git is that you will have to edit each commit anyway, at least that's my experience. You usually need to fix up the ChangeLog entries in the commit message to conform with the Emacs file layout. Also, one needs to remove entries which touch files that are not in Emacs, or which are from authors who haven't signed papers with the FSF. > 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 add-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 difficult to interpret because the change and author would be > documented elsewhere. Things have gotten easier since the actual ChangeLog files get generated from the commit message. I would try to manually commit the changes with proper commit messages, so we would retain the history with the exception of the date of the change, which would be from the day of the merge. -David