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

[Markus Klein]

Hi!

I've the same problems with the cherry-picking feature again.

I merged: https://review.typo3.org/23032
I cherry-picked this to 6-1: https://review.typo3.org/23071
And from 6-1 I picked to 6-0: https://review.typo3.org/23072

Although I'm really sure the Change-Id was included in the commit messages of the cherry-picks, the 6-0 backport contained no Change-Id line anymore.
Funnily enough, in the 6-1 change a comment was posted by Gerrit saying: " This patchset was cherry picked to change: I2994839138059726716aa920c3b75a4f825a65ec"
Here we suddenly have a change-id.

I cherry-picked the 6-0 change locally, amended the commit and added the original change-id. After pushing I got a new change now, namely: https://review.typo3.org/23080

So Gerrit has somehow a clue of the change-id, but it is not visible to the user. And I have no idea, why my original change-id is removed.

I'll abandon the first 6-0 backport now.

Kind regards
Markus

------------------------------------------------------------
Markus Klein
TYPO3 CMS Active Contributors Team Member

> -----Original Message-----
> From: typo3-team-core-bounces at lists.typo3.org [mailto:typo3-team-core-
> bounces at lists.typo3.org] On Behalf Of Philipp Gampe
> Sent: Thursday, July 18, 2013 1:12 PM
> To: typo3-team-core at lists.typo3.org
> Subject: Re: [TYPO3-core] "cherry-pick to" feature in Gerrit
> 
> Hi Markus,
> 
> Markus Klein wrote:
> 
> > Nevertheless because you mentioned it here I just remembered that the
> > cherry-picking of Gerrit seems to work different some way. I had a
> > patch which couldn't be applied by the cherry-pick feature, but a
> > local cherry-pick worked just fine. I can't remember which patch it
> > was, but there's obviously a different behavior.
> 
> If you do it locally, then git can use rerere and your local history to resolving.
> You just have more information there ... git is really smart about this.
> 
> Best regards
> --
> Philipp Gampe – PGP-Key 0AD96065 – TYPO3 UG Bonn/Köln Documentation
> – Active contributor TYPO3 CMS
> TYPO3 .... inspiring people to share!
> 
> _______________________________________________
> Before posting to this list, please have a look to the posting rules on the
> following websites:
> 
> http://typo3.org/teams/core/core-mailinglist-rules/
> http://typo3.org/development/bug-fixing/diff-and-patch/
> _______________________________________________
> TYPO3-team-core mailing list
> TYPO3-team-core at lists.typo3.org
> http://lists.typo3.org/cgi-bin/mailman/listinfo/typo3-team-core