Re: [Wireshark-dev] Wiki: Backporting A Change To A Release Branch

2022-09-26 Thread chuck c
Thanks! In theory I followed the instructions in the WSDG but that was several years ago now. In case anyone else hits this in the future: wireshark$ git checkout -b github_4_0_qt6 upstream/release-4.0 fatal: 'upstream/release-4.0' is not a commit and a branch 'github_4_0_qt6' cannot be created

Re: [Wireshark-dev] Wiki: Backporting A Change To A Release Branch

2022-09-26 Thread Gerald Combs
Did you clone your repository with `--single-branch`? If so you might need to run `git fetch upstream release-4.0`. On 9/26/22 1:00 PM, chuck c wrote: wireshark$ git remote -v downstream      g...@gitlab.com:chuckcraft/wireshark.git (fetch) downstream      

Re: [Wireshark-dev] Wiki: Backporting A Change To A Release Branch

2022-09-26 Thread chuck c
Thank you. I'll dig a little deeper in my system. thanks chuckc On Mon, Sep 26, 2022 at 3:13 PM Pascal Quantin wrote: > Hi Chuck, > > it works fine here: > > ~/wireshark/git$ git remote -v > downstream g...@gitlab.com:pquantin/wireshark.git (fetch) > downstream

Re: [Wireshark-dev] Wiki: Backporting A Change To A Release Branch

2022-09-26 Thread Pascal Quantin
Hi Chuck, it works fine here: ~/wireshark/git$ git remote -v downstream g...@gitlab.com:pquantin/wireshark.git (fetch) downstream g...@gitlab.com:pquantin/wireshark.git (push) upstreamg...@gitlab.com:wireshark/wireshark.git (fetch) upstream

Re: [Wireshark-dev] Wiki: Backporting A Change To A Release Branch

2022-09-26 Thread chuck c
wireshark$ git remote -v downstream g...@gitlab.com:chuckcraft/wireshark.git (fetch) downstream g...@gitlab.com:chuckcraft/wireshark.git (push) upstreamg...@gitlab.com:wireshark/wireshark.git (fetch) upstreamg...@gitlab.com:wireshark/wireshark.git (push) wireshark$ git

Re: [Wireshark-dev] Wiki: Backporting A Change To A Release Branch

2022-09-26 Thread Jaap Keuter
Hi, Yes, the text is still relevant, in case you’re looking to back port a change from master to release-X.Y. What you’re seem to be looking at is making a change in release-4.0 only. So, checkout release-4.0 first. Then create a branch from that and put your change on there and push that.