[TYPO3-core] Gerrit submission process for multiple branches

[Ernesto Baschny [cron IT]]

Ernesto Baschny [cron IT] schrieb am 31.10.2011 12:11:

> - as soon as the biggest release review process is finished (merged),
> you (or someone else) can do a cherry-pick or adapt the patch for older
> branches.

To elaborate a bit on this part:

- all review requests regarding a certain issue should set the "topic"
to that issue number. This is already documented in the Git contribution
guide (on Wiki)

- the backported bugfix might be considered a "no-brainer" if the fix is
really *the same* as in the higher branch.

- sometimes the backported bugfix is so different from the original that
it deserves some more reviews (especially by testing). This is for
example especially important regarding the different system requirements
in our different branches:

a) PHP compatibility (PHP5.3 in 4.6 but PHP5.2 in 4.5)
b) IE6 compatibility (in 4.4 and 4.6)
c) safe_mode compatibility (if possible in 4.4, 4.5)
...

In case of these kind of potential dangers, please consider not just
blindly "merging" some backported fix, but to let it open for "review".
Maybe having a reminder in the typo3.core list explaining the reasons
for a further test.


All in all I see the need to document this policy in a non-technical
guideline, because we have it documented already for how to do a simple
backport with Git:

http://wiki.typo3.org/Contribution_Walkthrough_with_CommandLine#Backporting_a_change_to_other_branches

Cheers,
Ernesto