[TYPO3-core] [GIT] Best practice with daily tasks
info at sk-typo3.de
Thu Mar 3 21:50:09 CET 2011
Am 03.03.2011 21:06, schrieb Peter Niederlag:
> Am 03.03.2011 19:42, schrieb Steffen Kamper:
>> do you now set up a technique how to make a patch available for more
>> than one branch?
> you can't do it with *one* patch/review.
> you can only take the patch and apply it on another <topicbranch>
> git cherry-pick <sha1>
>> I recognized some patches on gerrit that are now for master (trunk) only
>> but need to be applied to 4_5 as well.
> As some were afraid this would lead to multiple/additional parallel
> reviews, as we can't force a relation/dependancy between these commits,
> we started with a recommendation like this:
> - http://forge.typo3.org/projects/typo3v4-core/wiki/Contribute_Walkthrough
> I am not sure at all if that is applicable in pratice though.
maybe we can write a line in the commit message like:
Other branch: TYPO3_4-4, TYPO3_4-5
This would be helpful too if we read commit log, then we know if a patch
was fixed in other branches too.
More information about the TYPO3-team-core