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) upstream g...@gitlab.com:wireshark/wireshark.git (fetch) upstream g...@gitlab.com:wireshark/wireshark.git (push) ~/wireshark/git$ git checkout -b test upstream/release-4.0 Branch 'test' set up to track remote branch 'release-4.0' from 'upstream'. Switched to a new branch 'test' Le lun. 26 sept. 2022 à 22:00, chuck c <bubbas...@gmail.com> a écrit : > wireshark$ git remote -v > downstream g...@gitlab.com:chuckcraft/wireshark.git (fetch) > downstream g...@gitlab.com:chuckcraft/wireshark.git (push) > upstream g...@gitlab.com:wireshark/wireshark.git (fetch) > upstream g...@gitlab.com:wireshark/wireshark.git (push) > > wireshark$ git branch -r -l | grep -i upstream > upstream/master > > 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 from it > > (link to the wiki page the original email referenced: > https://wiki.wireshark.org/Development/SubmittingPatches#backporting-a-change-to-a-release-branch > ) > > On Mon, Sep 26, 2022 at 2:43 PM Jaap Keuter <jaap.keu...@xs4all.nl> wrote: > >> 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. >> >> Regards, >> Jaap >> >> >> On 26 Sep 2022, at 00:52, chuck c <bubbas...@gmail.com> wrote: >> >> Is this section of the Wiki still accurate? >> >> (substituting "release-4.0" for "master-X.Y" >> >> "Create and checkout a new branch with a name related to the type of >> change (e.g. the bug number you're fixing or the dissector you're working >> on): >> git checkout -b my-branch-name upstream/master-X.Y >> where "master-X.Y" is the release branch to which to backport the change. >> >> This creates a branch named "my-branch-name" based on the master-X.Y >> branch in the official repository." >> >> Or how best to make a change to: >> >> https://gitlab.com/wireshark/wireshark/-/blob/release-4.0/.github/workflows/windows.yml >> that doesn't apply to master. >> >> thanks >> chuckc >> >> ___________________________________________________________________________ >> Sent via: Wireshark-dev mailing list <wireshark-dev@wireshark.org> >> 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 >> <wireshark-dev-requ...@wireshark.org?subject=unsubscribe> >> >> >> >> ___________________________________________________________________________ >> Sent via: Wireshark-dev mailing list <wireshark-dev@wireshark.org> >> 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 <wireshark-dev@wireshark.org> > 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 <wireshark-dev@wireshark.org> 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
