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: Thu, 19 Jan 2017 22:57:18 +0100 Message-ID: <87o9z2sog1.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> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1484863106 14307 195.159.176.226 (19 Jan 2017 21:58:26 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 19 Jan 2017 21:58:26 +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 Thu Jan 19 22:58:20 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 1cUKia-0001yx-6X for ged-emacs-devel@m.gmane.org; Thu, 19 Jan 2017 22:58:04 +0100 Original-Received: from localhost ([::1]:51231 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUKie-0004Nr-TB for ged-emacs-devel@m.gmane.org; Thu, 19 Jan 2017 16:58:08 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50535) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUKi6-0004NZ-77 for emacs-devel@gnu.org; Thu, 19 Jan 2017 16:57:35 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUKi3-0005zR-1d for emacs-devel@gnu.org; Thu, 19 Jan 2017 16:57:34 -0500 Original-Received: from randomsample.de ([5.45.97.173]:55412) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cUKi2-0005uQ-NN; Thu, 19 Jan 2017 16:57:30 -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=BCggvMbgfphSHNmKoZboN8taxwD9BfAGc1AsiN37UhU=; b=Rh/9lhQToVdl7L3lFDtuJxT6sIPdBOc8qsi7oOJTwG/nvUBrqn6+m/+u84oPCv0F7PbOBIrbRGwUCj3ETBrXKYneJGqS3TE2R8TVO49lsJ3GIyfhFSA7qsbTD+3dCu6Z; 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 1cUKhu-0006GW-Id; Thu, 19 Jan 2017 22:57:22 +0100 In-Reply-To: <87h94vdj3n.fsf@gmail.com> (Edward John Steere's message of "Thu, 19 Jan 2017 20:01:48 +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:211410 Archived-At: 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. > As I said in my previous email I'll make a start on the tests. That's great, thanks! I'll push a branch with my progress soon. -David