Wireshark · Wireshark-dev: Re: [Wireshark-dev] Cherry-picking, gitlab permissions

[Graham Bloice <graham.bloice@xxxxxxxxxxxxx>]

On Wed, 26 Aug 2020 at 14:05, Pascal Quantin <pascal@xxxxxxxxxxxxx> wrote:

Hi John,

Le mer. 26 août 2020 à 14:58, John Thacker <johnthacker@xxxxxxxxx> a écrit :

The official Gitlab instructions (along with the still being transitioned developer's guide) mention the ability to cherry pick merges from the GUI:

https://docs.gitlab.com/ee/user/project/merge_requests/cherry_pick_changes.html#cherry-picking-a-merge-request

https://www.wireshark.org/docs/wsdg_html_chunked/ChSrcContribute.html

Those buttons don't appear for me. I do see this bug about the cherry-pick button not appearing for projects set to fast-forward merge only, like wireshark:

https://gitlab.com/gitlab-org/gitlab/-/issues/5990

but the workaround listed in that issue doesn't work for me either.

I do not see this button either, but when I select a commit and click on the options button (upper right part of the commit window) I can select cherry-pick. I don't know if you will see it in the Wireshark repository with your current permission level but you should be able to perform the cherry-pick in your own fork and then push a MR.

The "Options" droplist Pascal mentions can be seen on this page: https://gitlab.com/wireshark/wireshark/-/commit/847d3949c977a39c3cea15a214af02671ccd21e9?merge_request_iid=26

Let us know if you can't see it John. 

  

Best regards,

Pascal.

I suspect that it may also have to do with permission levels. Is the current workaround to do it from the command line? Are there plans to have people who are not core developers request get and various intermediate levels of permission? The "Reporter" level of permission seems to include only things that previously people could get by registering for Bugzilla, and some other features that people used to be able to do seem at the "Developer" level (though that also includes some higher level permissions too.)

--

Graham Bloice