From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Edward John Steere Newsgroups: gmane.emacs.devel Subject: Re: CEDET Merge Date: Thu, 19 Jan 2017 20:01:48 +0200 Message-ID: <87h94vdj3n.fsf@gmail.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> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1484849245 16897 195.159.176.226 (19 Jan 2017 18:07:25 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 19 Jan 2017 18:07:25 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) 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 Thu Jan 19 19:07:15 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 1cUH6y-0002Tg-4N for ged-emacs-devel@m.gmane.org; Thu, 19 Jan 2017 19:07:00 +0100 Original-Received: from localhost ([::1]:50170 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUH72-0001cV-SP for ged-emacs-devel@m.gmane.org; Thu, 19 Jan 2017 13:07:04 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUH28-00073e-B9 for emacs-devel@gnu.org; Thu, 19 Jan 2017 13:02:01 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUH25-0002ln-Ds for emacs-devel@gnu.org; Thu, 19 Jan 2017 13:02:00 -0500 Original-Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:35343) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cUH25-0002l4-8Y; Thu, 19 Jan 2017 13:01:57 -0500 Original-Received: by mail-wm0-x241.google.com with SMTP id d140so711230wmd.2; Thu, 19 Jan 2017 10:01:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=ixK7sLT47fZm9omRoFuAT1rpD1ZLBfc+o3tEzk49Ges=; b=Ao9IS4OpQpbogX4av1S978HLBN+fu/+AWHV+EuC0LOE6hIqn/bCB6DZeP3ZRIozOga QR6cKwMQqY4M85C0DqUWDmjlCQoRtZmJniaUI07kT9DWcp9RwAmUJhT8dycQe8RfORf5 37+cKkWxeMXp7aLJPXYui8YAA4H8t1r3EUcJDL5Y/jUbjAJXTEvo98KFoxaWkkmczUT2 NDgzRPbdXch+m2y4oLeMkCqQP/oTCeoLs0E/StQ3m0/6vI8uzMUXlO1zHo9qGqkOUD7L GGbyUM/aUcjrfaXbY07187SVZm1DP37dA/TsVuWvoT3huoSDlx+3HdC+mgtB2BUA1wiB l3Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=ixK7sLT47fZm9omRoFuAT1rpD1ZLBfc+o3tEzk49Ges=; b=dlDzQtEc2Hbmt3yRBmUWl3+b0HdgSqzzE96yP8QgteHdjsMKs0nNA6hG/rps89dVuw Lo8ibN7rnU9mP5EtAq9YYhvA094imL17Ftdd91z7vLrmqDGO2QtuGzudnjK5DRY04ZtU wfr4KyS+7rzedqPgQATu3ggs0Ls6Lzo62d/Oag9at1FBkdWOaFUscvaTChWqIFOCBHPY i6fLgV+rPk0vvp91HF27EgUKJN/YxvvdxoeuoMJ7K+wiK9UoYynhiVV3PMRQLdywNvnM euTdCGCMi+ZtVc6ULfxzY2a12c/x0dzXW7TFobA+Y3Q3GyIA4MKXx5C/ZDMZd1Gboxvp DEsQ== X-Gm-Message-State: AIkVDXJz0/Tefh+hJuEDg2+5/I+7eHQZZgpcnHD+VbpuSmyUg5wHIEPcey/ZeFoe58YIJw== X-Received: by 10.28.131.72 with SMTP id f69mr8940884wmd.140.1484848915886; Thu, 19 Jan 2017 10:01:55 -0800 (PST) Original-Received: from edward ([41.193.194.172]) by smtp.gmail.com with ESMTPSA id w79sm14357337wmw.0.2017.01.19.10.01.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2017 10:01:54 -0800 (PST) In-Reply-To: <8737gguipm.fsf@engster.org> (David Engster's message of "Wed, 18 Jan 2017 23:05:57 +0100") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::241 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:211409 Archived-At: > 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. As I said in my previous email I'll make a start on the tests.