From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Thomas Fitzsimmons Newsgroups: gmane.emacs.devel Subject: Re: master 069a0e4: Sync with soap-client repository, version 3.0.0 Date: Sun, 25 Oct 2015 16:25:26 -0400 Message-ID: References: <20151024123557.27656.88941@vcs.savannah.gnu.org> <3la8r8kvdl.fsf@fencepost.gnu.org> <83r3kidc4r.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1445804767 13353 80.91.229.3 (25 Oct 2015 20:26:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 25 Oct 2015 20:26:07 +0000 (UTC) Cc: rgm@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Oct 25 21:25:52 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZqRrT-0008S6-Gd for ged-emacs-devel@m.gmane.org; Sun, 25 Oct 2015 21:25:51 +0100 Original-Received: from localhost ([::1]:49436 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqRrS-0003QD-Q5 for ged-emacs-devel@m.gmane.org; Sun, 25 Oct 2015 16:25:50 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqRrA-0003Q7-Cw for emacs-devel@gnu.org; Sun, 25 Oct 2015 16:25:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZqRr6-0003wB-9u for emacs-devel@gnu.org; Sun, 25 Oct 2015 16:25:32 -0400 Original-Received: from mail-io0-x22e.google.com ([2607:f8b0:4001:c06::22e]:36441) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqRr5-0003vq-Vl for emacs-devel@gnu.org; Sun, 25 Oct 2015 16:25:28 -0400 Original-Received: by ioll68 with SMTP id l68so169004262iol.3 for ; Sun, 25 Oct 2015 13:25:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fitzsim_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=xjup7NKEyhl7u7OBjq+g52dDIYPHreEEmE9OIlngAIM=; b=rP35a+gCnDz4+XXKAS5nxM36zIRjNgwiaQDmbYXXngGE6DIWO7gt6kMPLoZd6Ezy/w NjMlPcccBcUcjp2Dt+r+D5s6BpZH3bQO1pD88w700MYZwD2OiL4AulbJj12GZ6gqnero yPImnGKKgFDSrcEGuGrYUSS6Ub01kNRmuYSTpPalGDXTehCa9XWnlbzXR4F4InVi0Az4 iKaw5IOdwimicR4LZLo+4gBYk3OefoYKmNOtvm/3kn7b5vTCqXJ1auFqLR1DzsGwAaWl l3MB9a8A+lhZe4yeFmgFplTRlpBmDLEwq8SEMLv2jk4EO9NjFAHpCxvB5452y5NBT/ix Ekuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-type; bh=xjup7NKEyhl7u7OBjq+g52dDIYPHreEEmE9OIlngAIM=; b=GnUTefIBJeJe/vmEAx9ewdg0RrnvBeY5t9/8m1NOaLA8dPjXRlvKQRsiYeAdtrXdcZ /qfJ1So5Gop6xb5JEr/5MqCjTYH8ekVLmiH3knFzoVtL1wCqqqgaK9JmcgAALZirB98Z LmKpqnQEBvadYGiLprtlkNE8vkFSRH0XvldwXcga7cGZaDT40dMNaXMYVr5IT2Cpp/8t nHTYEWF9YMsY9Gbtip45bxtu9wPDequf22+VEPi77HxVI1+hvk8gEQAPEkm5XEVBz9Ig oac8BqNJWC4ZRJK+sGQi3j3I+yXo4BQBZPnJS/m1yRQLWe13InGjAuckE3UOYFR9Apil SZpw== X-Gm-Message-State: ALoCoQndzDx8ktTkF7aGMuuyt9I6gjMmpB427IB5ayIpfXkt5UXl+/841xKP0Gz7KcwMwFXD44Qy X-Received: by 10.107.169.25 with SMTP id s25mr7325138ioe.68.1445804727382; Sun, 25 Oct 2015 13:25:27 -0700 (PDT) Original-Received: from hp-dv5t (69-165-165-189.dsl.teksavvy.com. [69.165.165.189]) by smtp.gmail.com with ESMTPSA id b26sm8227360iod.40.2015.10.25.13.25.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Oct 2015 13:25:26 -0700 (PDT) In-Reply-To: <83r3kidc4r.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 25 Oct 2015 20:41:24 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c06::22e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:192621 Archived-At: Eli Zaretskii writes: >> From: Thomas Fitzsimmons >> Date: Sun, 25 Oct 2015 00:25:43 -0400 >> Cc: emacs-devel@gnu.org >> >> To reduce tedium and precisely represent authorship and history within >> the Emacs repository, maybe it would make sense to add emacs-soap-client >> as a Git subtree, like GNU Elpa allows for externally-hosted projects. >> Is that an option for the main Emacs Git repository? > > We need to be able to produce a ChangeLog from the Git commit log, see > ChangeLog.2. That is why Glenn requested to include proper commit > logs when merging. > > I see that you maintain a ChangeLog file in the repository. Can't you > simply copy that into the merge commit log, after deleting the > date-and-name headers? That would go a long way towards solving the > issue without undue hardships for you, I think. Yes, history and authorship will still be squashed together, but I guess it will satisfy Emacs ChangeLog generation. What I'll do this time is sync 3.0.1, with just the homepage change, but put the giant 3.0.0 ChangeLog contents into the 3.0.1 sync commit log. The history will be a little out of sync with the git changes, but at least all the 3.0.0 changes will actually be reflected in the Emacs ChangeLog (this is in lieu of fixing the 3.0.0 sync commit message, which is immutable history now). And I'll add: Co-authored-by: Alexandru Harsanyi to the new commit message. Is that an acceptable recovery plan for the 3.0.0 information? Thomas