[TYPO3-dev] git/gerrit and "Changelog"

Bernhard Kraft kraft at webconsulting.at
Fri Jul 5 14:29:40 CEST 2013


Hello !

I assume everybody who has used git/gerrit will have noticed that the 
"Changelog" file is a reason for breaking every review/patch.

In the good'ol'days of the core list and SVN this was no problem. But 
nowadays when I just have to click a link to merge a patch it is 
questionable if this should get handled like before.

There are two options each with its cons and pros.

#1 Create some gerrit-server-side script which generates the Changelog 
entries automatically from the commit message first line.
pro: easy commit of older patches/reviews
con: someone has to create an appropriate script

#2 Leave it as it is
con: Its annoying to rebase every patch before merging
pro: You HAVE TO rebase (and hopefully verify/review) every patch before 
merging if head has changed.


Ideas?


greetings,
Bernhard



More information about the TYPO3-dev mailing list