Wireshark-dev: Re: [Wireshark-dev] How do fixes checked into the master branch get into release
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Gerald Combs <gerald@xxxxxxxxxxxxx>
Date: Sun, 08 Jun 2014 14:20:42 -0700
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.