Jump to content

User talk:SBassett

Rendered with Parsoid
From Wikitech
Latest comment: 2 years ago by SBassett in topic Cherry picks not working

Welcome to Toolforge!

Hello SBassett, welcome to the Toolforge project! Your request for access was processed, and you should be able to use ssh to connect to login.tools.wmflabs.org. You will need to logout and login again at https://toolsadmin.wikimedia.org/ to activate your new permissions there.

Check the Toolforge help page for tips on using your account. You can also ask questions in our IRC channel at #wikimedia-cloud connect or send an e-mail to our mailing list cloud@lists.wikimedia.org.

Thank you, and have fun making Tools! --StrikerBot (talk) 05:45, 18 January 2019 (UTC)Reply

Cherry picks not working

It had to do with commit message not being populated correctly in cases where you have to resolve a conflict manually. I wrote about it in How_to_deploy_code#Commit_message_for_cherry_picks.

Notably, what I used for REL1_35 was wrong; there, I changed the commit ID altogether; that breaks the link between the original and cherry-picked patches. But for REL1_36, I did it the right way and that's why you see it mentioned in the list of cherry-picks of https://gerrit.wikimedia.org/r/c/mediawiki/extensions/SecurePoll/+/755432/

Thanks for the help today! huji (talk) 19:06, 19 January 2022 (UTC)Reply

Sure, and thanks for adding that doc re: cherry-picking patches. SBassett (talk) 20:53, 19 January 2022 (UTC)Reply