MediaWiki is currently developed in two branches, with everything goingto trunk, and a slower number of revisions getting also copied to thestable branch.That's also the way we want to continue working, having a trunk and astable branch.Currently we store the release notes in a file called RELEASE-NOTES inthe phase3 root of each branch. This is a problem when adding a revisionfor backport, since the release notes are not suitable to be added tothe trunk RELEASE-NOTES (they would go inside HISTORY)but it needs to be added to REL1_X RELEASE-NOTES.So we end up with release notes added in a different commit, orrevisions with merge conflicts for merging. Which is inconvenient.Thus, I propose that, from the point we branch 1.18, we keep the stablebranch release notes in trunk, and add trunk release notes in adifferent file. trunk and branch RELEASE-NOTES would effectively be thesame file (a revision modifing RELEASE-NOTES and not tagged for backportwould be a bug). This simple change would give us much cleaner merges.When tagging a new branch, the trunk RELEASE-NOTES would move toHISTORY, the trunk release notes file to RELEASE-NOTES and a new onewould be created for trunk.