[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: master 069a0e4: Sync with soap-client repository, version 3.0.0
From: |
Eli Zaretskii |
Subject: |
Re: master 069a0e4: Sync with soap-client repository, version 3.0.0 |
Date: |
Sun, 25 Oct 2015 22:34:20 +0200 |
> From: Thomas Fitzsimmons <address@hidden>
> Cc: address@hidden, address@hidden
> 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 <address@hidden>
>
> to the new commit message. Is that an acceptable recovery plan for the
> 3.0.0 information?
Yes, thanks.