Re: How do fixes checked into the master branch get into releases/release branches?

[Gerald Combs <gerald () wireshark org>]

On 6/8/14, 2:10 PM, Richard Sharpe wrote:
> Hi folks,
>
> I notice that there is a master-1.12 branch and a v1.12.0-rc1 tag, but
> neither of them seem to have the recent fixes for the spnego
> dissector.
>
> How/when would these get into a release branch?

The easiest way is to pull up the review on code.wireshark.org, click
"Cherry Pick To", and fill in "master-1.12". If that fails or if you
prefer to use the command line you can use "git review -X <change #>" if
you have git-review installed or cherry-pick using plain old git.
___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev () wireshark org>
Archives:    http://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request () wireshark org?subject=unsubscribe