[TYPO3-core] "cherry-pick to" feature in Gerrit
klein.t3 at mfc-linz.at
Tue Aug 13 14:37:59 CEST 2013
> On 13.08.2013 12:11, Markus Klein wrote:
> > Hello Peter!
> >> If there is no Change-Id line in the commit message then there is no
> >> Change- Id, neither does gerrit have on!
> > It somehow has a Change-Id, otherwise it wouldn't have been able to
> > post the comment in the 6-1 change that it has been cherry-picked to
> > 6-0 with id I2994839138059726716aa920c3b75a4f825a65ec.
> You are definitly right. A Change—Id actually is assigned/created per
> review/change. What I wanted to say is, if the commit-message doesn't have
> a Change-Id and the patch is send to refs/for/BRANCH there is no way for
> gerrit to identify the patch and it will create a *new* review/change (where
> gerrit creates a new Change-Id).
Yes, but where is this newly created change-id visible to the user, if it is not in the commit-message?
In this scenario we have then two issues:
1) The original change-id is sometimes removed
2) The newly created change-id is of course not part of the commit message, but is also not visible somewhere else
> >> Looking for the Change-Id everything seems OK:
> >> f,
> >> n,z
> > Not it's not: Open _all_ the links I posted.
> I did open them. *Now* it is fine, all backports are to be found with the same
> Change-Id. Unfortunatly this needed some manual fixing because it didn't
> work out this way from the beginning.
> One thing to check/test comes to my mind:
> always start from a commit that is already accepted and pushed in a regular
> branch. If you backport from 6-1 to 6-0 while the change on 6-1 is not
> accepted yet this could probably trigger the problem?
Shouldn't cherry-picking always work? Independent whether a changeset is merged or not?
The button is there at least and it is a rather simple GIT operation.
The reason why I usually backport from branch to branch is, that a change might be easier to apply.
A 6.2 patch might apply fine on 6.1, but not on 6.0. But the same patch take from 6.1 might also apply on 6.0, due to the context of the changes being more similar.
More information about the TYPO3-team-core