Re: ChangeLog when merging from "upstream"

[Eli Zaretskii]

> From: Reiner Steib <address@hidden>
> Date: Thu, 05 Aug 2004 23:12:24 +0200
> 
> I want to merge a change from Gnus' repository (committed after
> emacs21_4-gnus-5_10-branchpoint) into Emacs (gnus-5_10-branch).
> 
> The change in Gnus is dated 2004-08-02.  When I install the changes on
> 2004-08-06, should it read as follows?
> 
> ,----
> | 2004-08-06  Reiner Steib  <address@hidden>
> | 
> |     Sync with v5_10 branch:
> | 
> | 2004-08-02  Reiner Steib  <address@hidden>
> | 
> |     * gnus.el (gnus-group, gnus-summary, gnus-summary-sort): Fix
> |     custom-manual entries.
> | [...]
> `----

No, all the dates should be changed to the date of the commit.

> 
> I've seen similar non-monotonic date entries for tramp:

I think all those should be fixed so that the dates are always
monotonic.