[TYPO3-core] How to handle dependencies in Gerrit?
Markus Klein
klein.t3 at mfc-linz.at
Tue Jun 19 11:05:25 CEST 2012
>
> Hi,
>
> the reason I am writing is the topic 24087. The situation is like this:
>
> * There is an patch already merged in master, that only solves a part of the issue.
> * Backports of this patch are pending in Gerrit
[1]
> * I pushed a new patch for master, that solves it finally but is based on the first patch.
[2]
>
> How should that be solved? I see 2 possibilities:
>
> 1) Amend the backports with the "new" solution, merge the second fix to master and do not backport it.
>
> 2) Merge the backports of the first fix into branches "as is" and backport the second patch from master to release branches.
>
> What is the way to go?
I'm for the second choice as it keeps [3] clean.
>
> Ciao,
> Marcus
>
[1] https://review.typo3.org/#/q/tr:24087,n,z
[2] https://review.typo3.org/12185/
[3] http://www.typo3-anbieter.de/typo3-merges/
More information about the TYPO3-team-core
mailing list