[TYPO3-core] "cherry-pick to" feature in Gerrit

Markus Klein klein.t3 at mfc-linz.at
Wed Jul 17 00:20:37 CEST 2013


Some might have already noticed that the admin team updated the Gerrit version again.
This new version brings a new feature, the "cherry-pick to" button.

This feature is extremely useful for backporting patches.

How To:
1.) Click the button
2.) Simply type "6-" into the first textfield.
3.) Just select the desired TYPO3 version, which is provided by autocomplete
4.) Cleanup the commit message. The same rules as before apply:
     - Keep the Change-Id
     - Remove all Revied-By, and similar lines
     - Remove the (cherry-picked from ....) line

Q: I'm getting a strange error message after trying to cherry-pick.
A: The cherry-pick does not apply cleanly. Sorry, but manual conflict resolving is required. Backport manually.

I hope this helps.

Kind regards

Markus Klein
TYPO3 CMS Active Contributors Team Member

More information about the TYPO3-team-core mailing list