ChangeLog when merging from "upstream"

[Reiner Steib]

Hi,

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.
| [...]
`----

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

,----
| 2004-07-17  Kai Grossjohann  <address@hidden>
| 
|       Sync with Tramp 2.0.43.
| 
|       * net/tramp.el [...]
| 
| 2004-07-13  Michael Albinus  <address@hidden>
| 
|       * net/tramp.el [...]
| 
| 2004-07-17  Jonathan Yavner  <address@hidden>
| 
|       * emacs-lisp/testcover.el: [...]
`----

Bye, Reiner.
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo--- PGP key available via WWW   http://rsteib.home.pages.de/