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: Fri, 20 Jan 2017 23:20:05 +0100 Message-ID: <87k29ps7ai.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> <8737gguipm.fsf@engster.org> <87h94vdj3n.fsf@gmail.com> <87o9z2sog1.fsf@engster.org> <87vataadkk.fsf@red-bean.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1484950878 9338 195.159.176.226 (20 Jan 2017 22:21:18 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 20 Jan 2017 22:21:18 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) Cc: Edward John Steere , Eli Zaretskii , Stephen Leake , emacs-devel@gnu.org To: Karl Fogel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 20 23:21:11 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 1cUhYF-0000d9-KK for ged-emacs-devel@m.gmane.org; Fri, 20 Jan 2017 23:20:55 +0100 Original-Received: from localhost ([::1]:57593 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUhYK-0003vM-Kx for ged-emacs-devel@m.gmane.org; Fri, 20 Jan 2017 17:21:00 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUhXm-0003vG-JC for emacs-devel@gnu.org; Fri, 20 Jan 2017 17:20:27 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUhXj-0007wn-GN for emacs-devel@gnu.org; Fri, 20 Jan 2017 17:20:26 -0500 Original-Received: from randomsample.de ([5.45.97.173]:49989) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cUhXj-0007rH-6D; Fri, 20 Jan 2017 17:20:23 -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=JOPa/8Tgd0FL08tki9Ht4pEhEXGCbyRMIYIDzjjFQLs=; b=Iw2HUGSFPlSxNJM7PozX3SjnrSv0+jyhDAZF/Zs5c0qw7WLqTuAIMQrrwX0izyHxm09mh0RLkqVP0G/ptO5jJN8YXtmnojYC9IaStKz9Xzv2O/3D8hkzfLpiTrWiRlrY; 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 1cUhXW-00025x-5O; Fri, 20 Jan 2017 23:20:10 +0100 In-Reply-To: <87vataadkk.fsf@red-bean.com> (Karl Fogel's message of "Thu, 19 Jan 2017 16:29:31 -0600") 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:211445 Archived-At: Karl Fogel writes: > David Engster writes: >>Edward John Steere writes: >>>> 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 >>> >>> This sounds like a lot of work and the outcome sounds right. >> >>It's not that bad. 'format-patch' gives me a nice list of patches where >>I can correct the paths with 'sed' and fix up the commit messages. It's >>only about 100 patches, so I don't think it will take long. > > Regarding the earlier point about retaining history "with the exception of the date of the change": > > 'git commit' takes an optional '--date' option: > > --date= > Override the author date used in the commit. > > So even the date of each change could be correct. Yes, 'git am' does that automatically. However, I always followed the general rule that the generated ChangeLogs should have the date when the change enters the Emacs repository, so I'm not sure if I should even retain the original date? -David