[TYPO3-core] Gerrit submission process for multiple branches

Jigal van Hemert jigal at xs4all.nl
Sun Oct 30 13:25:31 CET 2011


On 30-10-2011 12:19, Xavier Perseguers wrote:
> Hi Francois,
>> Did we ever define what the correct process should be when we want to
>> submit patches to multiple branches? I recently submitted a patch for
>> 4.5, 4.6 and 4.7 and now Xavier remarked that I shouldn't have done so,
>> as it complicates the review process.

IIRC there were several changes in the policy or at least suggestions 
for one, but none was ever published somewhere.

>> I can agree with that, but OTOH I think submitting to only one branch
>> entails a real risk of forgetting other branches later on. For example,
>> I'm pretty sure that - in the rush of fixing stuff for releasing 4.6 -
>> quite a few backports to 4.5 were forgotten.

True, but pushing a change set to all branches (and some patches should 
go to master, 4.6, 4.5, 4.4) can cause a lot of work too. With seven or 
more versions of a patch this ends up in 50+ commits/pushes...

> What I find the best way is to push to master only with the topic branch
> set to the bug id and the appropriate "Releases:" tag in the commit
> message. Once it is ready to be merged, push it to the other branches
> and merge it right away.
> The only condition I see where it makes sense to push it to older
> branches as well is when the patch is not the same (aka slightly
> different).


Kind regards / met vriendelijke groet,

Jigal van Hemert.

More information about the TYPO3-team-core mailing list