Re: ChangeLog when merging from "upstream"

[Reiner Steib]

On Sat, Aug 07 2004, Richard Stallman wrote:

>     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.
>     | [...]
>     `----
>
> The whole thing should be dated with the date that you installed it.

Okay.

> By the way, I am not sure whether "Sync with v5_10 branch"
> is meant to describe the 8/2 change in gnus.el, or whether they
> refer to two different changes.  If the former, they should
> be together in one entry, to show they are talking about the same thing.

The former.

> If the latter, "Sync with v5_10 branch" is not sufficient, because
> ChangeLog needs to say what files and functions were changed and how.

That means that for the importing the v5_10 branch done by Andreas
Schwab (installed on 2004-07-22), we will have to add Gnus'
lisp/ChangeLog in lisp/gnus/ChangeLog.  And there, all dates should be
replaced with 2004-07-22.  Note that the changes from Gnus 5.9 to 5.10
(from the year 2000 upto 2004-07-22) span more than two thousand
entries.

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