Hi Elias, > On 15 Jul 2020, at 13:29, Elias Rudberg <elias.rudb...@bahnhof.net> wrote: > > Hi Andrew, > > I don't know how to cherry-pick. I was under the impression that only > the trusted commiters were allowed to do that, maybe I misunderstood > that.
One option is to have your local git on the target branch, and from there do “git cherry-pick -x <original commit ID>, then submit that - the change ID is preserved, so gerrit knows how to create a new change. And then there is a button in the GUI that says “cherry-pick” when viewing an existing change (I think it must be merged but not 100% remember) - which basically does the above in one shot - you only specify the target branch, and it does the cherry-pick and creates a new change set. Both of the above approaches should be available for any user (the first is the same as just submitting any change, in fact). Would you feel like trying it out with change 27280 ? Else no worries, I am happy to do it as well, just let me know :) —a > > What I know so far about the gerrit system is what I read here: > https://wiki.fd.io/view/VPP/Pulling,_Building,_Running,_Hacking_and_Pushing_VPP_Code#Pushing_Code_with_git_review > > Is there a guide somewhere describing how to do cherry-picking? > Alternatively, could you do it for me? > > / Elias > > >> On Wed, 2020-07-15 at 12:27 +0200, Andrew 👽 Yourtchenko wrote: >> Hi Elias, sure, feel free to cherry-pick to stable/2005 branch and >> add me as a reviewer, then I can merge when JJB gives thumbs up. >> >> --a >> >>> On 15 Jul 2020, at 07:25, Elias Rudberg <elias.rudb...@bahnhof.net> >>> wrote: >>> >>> Hello Andrew, >>> >>> The following two fixes have been merged to the master branch, it >>> would >>> be good to have them in stable/2005 also: >>> >>> https://gerrit.fd.io/r/c/vpp/+/27280 (misc: ipfix-export unformat >>> u16 >>> collector_port fix) >>> >>> https://gerrit.fd.io/r/c/vpp/+/27281 (nat: fix regarding vm arg for >>> vlib_time_now call) >>> >>> Best regards, >>> Elias >>> >>> >>>> On Tue, 2020-07-14 at 19:04 +0200, Andrew Yourtchenko wrote: >>>> Hi all, >>>> >>>> As agreed on the VPP community call today, we will declare the >>>> current stable/2005 branch as v20.05.1 tomorrow (15th July) >>>> >>>> If you have any fixes that are already in master but not yet in >>>> stable/2005, that you want to get in there - please let me know >>>> before noon UTC. >>>> >>>> --a >>>> Your friendly release manager >>>> -=-=-=-=-=-=-=-=-=-=-=- >>>>
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#16971): https://lists.fd.io/g/vpp-dev/message/16971 Mute This Topic: https://lists.fd.io/mt/75503386/21656 Group Owner: vpp-dev+ow...@lists.fd.io Unsubscribe: https://lists.fd.io/g/vpp-dev/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
