Le 20/07/2021 à 06:06, Brian Wolff a écrit :
We could write
a custom merge driver for RELEASE-NOTES which always
puts ‘ours’ before ’theirs’,
but I’m not sure the result will justify the investment.
Didnt someone already do that? There used to be a ruby script floating
around for that.
The tool is:
https://github.com/MatmaRex/mediawikireleasenotes-driver
<https://github.com/MatmaRex/mediawikireleasenotes-driver> created in
2013. It leads me to some material we wrote at that time when the issue
got first identified:
* 2013 RFC
https://www.mediawiki.org/wiki/Requests_for_comment/Release_notes_automation
<https://www.mediawiki.org/wiki/Requests_for_comment/Release_notes_automation>
* 2018 task (still open)
https://phabricator.wikimedia.org/T200392
<https://phabricator.wikimedia.org/T200392>
If we go with a merge driver, it would needs to be installed on CI
(zuul-merger does use cgit) and on Gerrit (which uses jGit).
Antoine "hashar" Musso