[Wireshark-dev] Non-core cherry pick

2021-10-24 Thread chuck c
https://gitlab.com/wireshark/wireshark/-/commit/51e1381b235b3fad563f5ec7467ea4e001f2605b

When I select cherry-pick to release-3.6, I get the message "You can only
create or edit files when you are on a branch".

What's the best way to have this added to 3.6?

thanks
chuckc
___
Sent via:Wireshark-dev mailing list 
Archives:https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe


Re: [Wireshark-dev] Non-core cherry pick

2021-10-24 Thread John Thacker
On Sun, Oct 24, 2021 at 9:59 PM chuck c  wrote:

>
> https://gitlab.com/wireshark/wireshark/-/commit/51e1381b235b3fad563f5ec7467ea4e001f2605b
>
> When I select cherry-pick to release-3.6, I get the message "You can only
> create or edit files when you are on a branch".
>
> What's the best way to have this added to 3.6?
>

I don't know if that's the best one to cherry-pick automatically through
the GUI. It changes the NEWS file, which has the version number in text, so
it probably needs some manual attention. However in the general case, I
believe I recall getting that message from the GUI when my personal fork on
Gitlab didn't have the release-3.6 branch mirrored, shortly after that
branch was related. I had to go and update my mirroring settings. Have you
cherry-picked other changes before?

John Thacker
___
Sent via:Wireshark-dev mailing list 
Archives:https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe


Re: [Wireshark-dev] Non-core cherry pick

2021-10-25 Thread chuck c
Long time listener. First time cherry-picker.
I was just hoping to get the tick marks around tshark -G folders in the 3.6
release notes.
Otherwise no need for me to cherry pick. If the MRs I submit need to be in
releases it's done by the person doing the actual merge.

There is a News.txt in .gitignore:
https://gitlab.com/wireshark/wireshark/-/commit/9e1128bfb6ca2cc75563813304e4feb9780f14f7

I wonder if NEWS should be added also since it is created by the docbook
build:
https://gitlab.com/wireshark/wireshark/-/commit/ec34959796a5554f1fa9b5c63224e7bd0334956a

On Sun, Oct 24, 2021 at 10:21 PM John Thacker  wrote:

> On Sun, Oct 24, 2021 at 9:59 PM chuck c  wrote:
>
>>
>> https://gitlab.com/wireshark/wireshark/-/commit/51e1381b235b3fad563f5ec7467ea4e001f2605b
>>
>> When I select cherry-pick to release-3.6, I get the message "You can only
>> create or edit files when you are on a branch".
>>
>> What's the best way to have this added to 3.6?
>>
>
> I don't know if that's the best one to cherry-pick automatically through
> the GUI. It changes the NEWS file, which has the version number in text, so
> it probably needs some manual attention. However in the general case, I
> believe I recall getting that message from the GUI when my personal fork on
> Gitlab didn't have the release-3.6 branch mirrored, shortly after that
> branch was related. I had to go and update my mirroring settings. Have you
> cherry-picked other changes before?
>
> John Thacker
> ___
> Sent via:Wireshark-dev mailing list 
> Archives:https://www.wireshark.org/lists/wireshark-dev
> Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
>  mailto:wireshark-dev-requ...@wireshark.org
> ?subject=unsubscribe
>
___
Sent via:Wireshark-dev mailing list 
Archives:https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe