From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.devel Subject: Re: CEDET Merge Date: Thu, 19 Jan 2017 16:29:31 -0600 Message-ID: <87vataadkk.fsf@red-bean.com> 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> Reply-To: Karl Fogel NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1484864990 28483 195.159.176.226 (19 Jan 2017 22:29:50 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 19 Jan 2017 22:29:50 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) Cc: Edward John Steere , 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 Thu Jan 19 23:29:45 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 1cULD9-0006S5-Gf for ged-emacs-devel@m.gmane.org; Thu, 19 Jan 2017 23:29:39 +0100 Original-Received: from localhost ([::1]:51307 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cULDE-00069p-A1 for ged-emacs-devel@m.gmane.org; Thu, 19 Jan 2017 17:29:44 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cULD8-00069a-BS for emacs-devel@gnu.org; Thu, 19 Jan 2017 17:29:39 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cULD5-0006KI-5t for emacs-devel@gnu.org; Thu, 19 Jan 2017 17:29:38 -0500 Original-Received: from mail-it0-x242.google.com ([2607:f8b0:4001:c0b::242]:33596) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cULD5-0006JB-1g; Thu, 19 Jan 2017 17:29:35 -0500 Original-Received: by mail-it0-x242.google.com with SMTP id e137so1086038itc.0; Thu, 19 Jan 2017 14:29:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:references:reply-to:date:in-reply-to :message-id:user-agent:mime-version; bh=YYN3oClOlRM1N2pcdlLtXSfPYMBS6DmujpMtMjvU/n4=; b=Ge+/vBOmTO0uiBIuGzkCC+xkMCldGl12sDFLs/GfDAhXyIVkVnBxAbhXVRNEEQqUHa OwFWd3ZvyCOangpOgEJozJmbvCM94xAB2zKbPDA6XFCf3u3cvHjviYaPMC7z8rPYGYmH YYBTRefUuxfPAh8KNIPitMFEIn978fFzYjklmaVpC0b0WraQtR93CpOcTpJTonff5KFr o6A5078UV+F0XqWFbK58+0KTMGybpTQxQJqphnRPPzxu/cvNaUTJBJnrjmYUUBKYYhLf EgbOfETnIRj3DGjBcCjQjMlUMgOuZ9UPf0dgq2Wb2Q5Eq3EY6bvcIeEqvtSYemBHuY3r vdRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:references:reply-to :date:in-reply-to:message-id:user-agent:mime-version; bh=YYN3oClOlRM1N2pcdlLtXSfPYMBS6DmujpMtMjvU/n4=; b=n5qNxEFNhOXtbSh96bobVWD1KlS/2a+pulJvvGCu10lj29EjPjwTkXSqhRERtDPYih zHPceq4NEV7Fr0mDEB0++8/KBRmY/cF43Yx506sV6ZCT55To1tkhjzkzjtNvV9LbrEaT i7ZgspxGWyZa5EtGuFwspOI0qnSTNGOs7ZbYzllecDvZFTIkbg3cLIbFh8nCTDvlLHIA fbDdHC9SZG4glfl5w5OHwGc9CxO2TSrjZNNcp4jKG1HNr7NpibY/6r8eJGlvO+66murH G/UlyfOSuOZQCEYdQj6ZwCUQxBkfJUjqVaQezpymnA0xb09lVvmhlsGE3t4gpsBT3dh8 +XqQ== X-Gm-Message-State: AIkVDXKLOiAH2VyFt+oKRo+rfNmIhmsUzf8ZHUFRwklGvg2vZ3dOmKP8lpU0hndLtgSJvQ== X-Received: by 10.36.26.9 with SMTP id 9mr902749iti.25.1484864972914; Thu, 19 Jan 2017 14:29:32 -0800 (PST) Original-Received: from kwork (74-92-190-114-Illinois.hfc.comcastbusiness.net. [74.92.190.114]) by smtp.gmail.com with ESMTPSA id x128sm313366ite.11.2017.01.19.14.29.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2017 14:29:32 -0800 (PST) In-Reply-To: <87o9z2sog1.fsf@engster.org> (David Engster's message of "Thu, 19 Jan 2017 22:57:18 +0100") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4001:c0b::242 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:211411 Archived-At: 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. Best regards, -Karl