Tim Starling wrote: > On 08/11/10 04:28, Platonides wrote: >> * When merging to an earlier release, the RELEASE-NOTES go there. >> On release, the new section is added as a whole on the trunk HISTORY. > > This is more or less what I do at the moment. When I create a new > major version, I update the HISTORY file in the new branch, copying in > changes from the RELEASE-NOTES in the old branch. > > If we have a 1.16.x release sequence and a 1.15.x release sequence, > then changes that are backported to 1.15.x are usually also backported > to 1.16.x, so the RELEASE-NOTES entry will be in both of them. So the > HISTORY file in the 1.16.x branch contains changes made to the 1.15.x > branch before the branch point, and the RELEASE-NOTES file contains > changes made after it. > > -- Tim Starling
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. _______________________________________________ Wikitech-l mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/wikitech-l
