2011/4/14 Platonides Platonides@gmail.com:
Thus, I propose that, from the point we branch 1.18, we keep the stable branch release notes in trunk, and add trunk release notes in a different file. trunk and branch RELEASE-NOTES would effectively be the same file (a revision modifing RELEASE-NOTES and not tagged for backport would be a bug). This simple change would give us much cleaner merges.
When tagging a new branch, the trunk RELEASE-NOTES would move to HISTORY, the trunk release notes file to RELEASE-NOTES and a new one would be created for trunk.
Wouldn't it be cleaner to just name the files RELEASE-NOTES-1.18 and so on? We can do the rename-and-move-stuff-to-HISTORY thing right before we release.
Roan Kattouw (Catrope)