Yuri Astrakhan <[email protected]> wrote: >> I don't like the idea of a bot doing this. Nor do I think writing release >> notes at commit time works well either (too many stupid conflicts).
> What's the issue with a bot appending a few lines to a release-notes > section if it sees it the commit message? But yes, release-notes conflicts > are a major pain and kills the streamlined patching workflow - > submit->review->merge, frequently requiring extra "->fix->review" steps > right before merge. > [...] As I wrote at http://www.mediawiki.org/wiki/Talk:Git/Workflow#Release_notes_conflicts_20763, this can be easily re-streamlined with a merge driver. As release notes for MediaWiki are probably mostly additions, it shouldn't be too hard to cover the common cases, and we certainly don't have the ambition to do text analysis in C, but can settle for Perl (or Python or even PHP :-)) instead. Tim _______________________________________________ Wikitech-l mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/wikitech-l
