[TYPO3-core] "cherry-pick to" feature in Gerrit
klein.t3 at mfc-linz.at
Thu Jul 18 00:13:46 CEST 2013
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.
I guess this is a real bug.
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
> 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 Gebert
> TYPO3 Server Administration Team Member
> TYPO3 .... inspiring people to share!
> Get involved: http://typo3.org
> My wish list:
> 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/
> -----END PGP SIGNATURE-----
> Before posting to this list, please have a look to the posting rules on the
> following websites:
> TYPO3-team-core mailing list
> TYPO3-team-core at lists.typo3.org
More information about the TYPO3-team-core