From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: master 069a0e4: Sync with soap-client repository, version 3.0.0 Date: Sun, 25 Oct 2015 22:34:20 +0200 Message-ID: <83a8r6d6wj.fsf@gnu.org> References: <20151024123557.27656.88941@vcs.savannah.gnu.org> <3la8r8kvdl.fsf@fencepost.gnu.org> <83r3kidc4r.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1445805291 20393 80.91.229.3 (25 Oct 2015 20:34:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 25 Oct 2015 20:34:51 +0000 (UTC) Cc: rgm@gnu.org, emacs-devel@gnu.org To: Thomas Fitzsimmons Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Oct 25 21:34:42 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 1ZqRzz-00011i-WF for ged-emacs-devel@m.gmane.org; Sun, 25 Oct 2015 21:34:40 +0100 Original-Received: from localhost ([::1]:49459 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqRzz-0005lb-7O for ged-emacs-devel@m.gmane.org; Sun, 25 Oct 2015 16:34:39 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37091) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqRzc-0005aS-Cj for emacs-devel@gnu.org; Sun, 25 Oct 2015 16:34:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZqRzY-0005pY-CG for emacs-devel@gnu.org; Sun, 25 Oct 2015 16:34:16 -0400 Original-Received: from mtaout29.012.net.il ([80.179.55.185]:42972) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqRzY-0005pS-4D; Sun, 25 Oct 2015 16:34:12 -0400 Original-Received: from conversion-daemon.mtaout29.012.net.il by mtaout29.012.net.il (HyperSendmail v2007.08) id <0NWS00C00MA8QM00@mtaout29.012.net.il>; Sun, 25 Oct 2015 22:33:33 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout29.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NWS0078QMFWL470@mtaout29.012.net.il>; Sun, 25 Oct 2015 22:33:33 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.185 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:192622 Archived-At: > From: Thomas Fitzsimmons > Cc: rgm@gnu.org, emacs-devel@gnu.org > Date: Sun, 25 Oct 2015 16:25:26 -0400 > > 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). You can do both: commit 3.0.1 with the above-mentioned log, then wait a few days until ChangeLog.2 is updated, and move those entries to the date of the 3.0.0 merge. > 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? Yes, thanks.