From: Eli Zaretskii <eliz@gnu.org>
To: Thomas Fitzsimmons <fitzsim@fitzsim.org>
Cc: rgm@gnu.org, emacs-devel@gnu.org
Subject: Re: master 069a0e4: Sync with soap-client repository, version 3.0.0
Date: Sun, 25 Oct 2015 22:34:20 +0200 [thread overview]
Message-ID: <83a8r6d6wj.fsf@gnu.org> (raw)
In-Reply-To: <m337wyelvt.fsf@fitzsim.org>
> From: Thomas Fitzsimmons <fitzsim@fitzsim.org>
> 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 <AlexHarsanyi@gmail.com>
>
> to the new commit message. Is that an acceptable recovery plan for the
> 3.0.0 information?
Yes, thanks.
next prev parent reply other threads:[~2015-10-25 20:34 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20151024123557.27656.88941@vcs.savannah.gnu.org>
[not found] ` <E1Zpy3B-0007Cg-U8@vcs.savannah.gnu.org>
2015-10-24 17:51 ` master 069a0e4: Sync with soap-client repository, version 3.0.0 Glenn Morris
2015-10-25 4:25 ` Thomas Fitzsimmons
2015-10-25 18:41 ` Eli Zaretskii
2015-10-25 20:25 ` Thomas Fitzsimmons
2015-10-25 20:34 ` Eli Zaretskii [this message]
2015-10-25 21:19 ` Thomas Fitzsimmons
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83a8r6d6wj.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=fitzsim@fitzsim.org \
--cc=rgm@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.