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

[Markus Klein]

Hi!

I did quite some backports already, but never experienced this issue.

But I had a very strange issue yesterday:
I cherry-picked a commit and accidentally also removed the Change-Id in the commit msg.
The patchset was created and the web ui showed me the patch correctly, including the missing change-id.
I clicked the edit commit-msg button and readded the change-id from the original patch.
After that I merged the patch and suddenly I had two change-id lines in the final merge.
https://review.typo3.org/22371

I guess this is a real bug.

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 Steffen Gebert
> Sent: Wednesday, July 17, 2013 10:51 PM
> To: typo3-team-core at lists.typo3.org
> Subject: Re: [TYPO3-core] "cherry-pick to" feature in Gerrit
> 
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Hi,
> 
> could sb. please check this, if it hurts?
> Jigal, do you have an ID where I can see this?
> 
> I expect Gerrit to run a jgit cherry-pick command, thus I'm wondering, why
> it's different than the original commit.
> If it's different, it's a Gerrit bug and I could report it upstream.
> 
> Kind regards
> Steffen
> 
> - --
> Steffen Gebert
> TYPO3 Server Administration Team Member
> 
> TYPO3 .... inspiring people to share!
> Get involved: http://typo3.org
> 
> My wish list:
> https://www.amazon.de/registry/wishlist/922E3JYSQ7CV/ref=cm_wl_sb_v?
> sort=priority
> 
> On 7/17/13 5:10 PM, Philipp Gampe wrote:
> > Hi Jigal,
> >
> > Jigal van Hemert wrote:
> >
> >> I've notice the two times that I used this feature that the "backport"
> >> had extra whitespace after the closing ?> tag. Manual backports (also
> >> using cherry-picking, no further editing) did not have this.
> >
> > Depends on what kind of whitespace this is.
> > - A single newline is ok, as it is part of the closing tag and does
> > not create any output
> > - Two newlines are a problem as they start the output.
> >
> > In the later case, this would be a bug and we cannot use this feature then.
> >
> > Best regards
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG/MacGPG2 v2.0.19 (Darwin)
> Comment: GPGTools - http://gpgtools.org
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
> 
> iQEcBAEBAgAGBQJR5wO/AAoJEIskG/rSlyw46qEH/1+wqP5GeXF6iEZD4klqwd
> YY
> vYN7LV8mGCvcIyqK139FVxg5wmWhrho45cHNi+W774RNf7pg4D6dsLR0BAm
> HmiZg
> ngQZfAOwBMcO55sG9uMhgWRx5qR9W1Digz06QZzEoU+2wahN/LA1cViOFvr
> Kr794
> uQg2KQvrzzhmDT0WlFNEFQlEH7ZTF7XpyM12yCzF1u1zV5fNXN1kIJ3NULETE0
> fO
> BSMjYBVrMfQBQ/22fMNx0T3BzM61EtaTfKLmMsPRL/687Puj5drShB2xH3jCbI
> Vj
> nUJ8GAV0TtUgJrkQyaP+oWlYfblgwWJlyXNMcYFfbVUgDWG39OCIMMRa6kG
> uZao=
> =UDoM
> -----END PGP SIGNATURE-----
> _______________________________________________
> 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