On 08/11/10 09:58, Platonides wrote:
The question was in the line of what to do with *trunk* HISTORY, for which two older releases would include the fix. Thus the idea of a "Bug fixes in 1.15.6 and 1.16.1" headline.
The RELEASE-NOTES for 1.16.x will be copied into trunk immediately before the branch point for 1.17.x. So after the branch, such a change will have a HISTORY entry for 1.16.1 and not 1.15.6.
I don't think it's worthwhile updating the HISTORY in trunk in between major releases, since the HISTORY file is intended for users of tarball releases.
Sometimes people do try to add things to the HISTORY file in between branch points, resulting in it containing a random selection of backported changes. Rather than pick through it and try to work out what's missing, I found it easier to delete the most recent sections and re-add them by copying from the branch RELEASE-NOTES.
-- Tim Starling