[Dario Lombardo <dario.lombardo.ml@xxxxxxxxx>]

If the bug was in branch master-2.2 only, what would be the correct way to push a fix in this branch only?

On Fri, Feb 10, 2017 at 6:37 PM, Paul Offord <Paul.Offord@xxxxxxxxxxxx> wrote:

Hi Guy and Pascal,

I'm 99% sure it's in the master branch as well but I'll check.  If so, I'll do as Pascal says and push a fix for master.

-----Original Message-----
From: wireshark-dev-bounces@wireshark.org [mailto:wireshark-dev-bounces@wireshark.org] On Behalf Of Guy Harris
Sent: 10 February 2017 17:23
To: Developer support list for Wireshark <wireshark-dev@xxxxxxxxxxxxx>
Subject: Re: [Wireshark-dev] Submitting a fix to 2.2.4

On Feb 10, 2017, at 9:17 AM, Paul Offord <Paul.Offord@xxxxxxxxxxxx> wrote:

> If I want to submit a fix for a bug in 2.2.4, do I switch to the master branch and then push the fix?  Or do I change to master-2.2.4 branch, apply the fix and push?

Is this a bug that's in the master branch *and* the 2.2.x branch, or is it only in the 2.2.x branch?
___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
Archives:    https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request@wireshark.org?subject=unsubscribe

______________________________________________________________________

This message contains confidential information and is intended only for the individual named. If you are not the named addressee you should not disseminate, distribute or copy this e-mail. Please notify the sender immediately by e-mail if you have received this e-mail by mistake and delete this e-mail from your system.

Any views or opinions expressed are solely those of the author and do not necessarily represent those of Advance Seven Ltd. E-mail transmission cannot be guaranteed to be secure or error-free as information could be intercepted, corrupted, lost, destroyed, arrive late or incomplete, or contain viruses. The sender therefore does not accept liability for any errors or omissions in the contents of this message, which arise as a result of e-mail transmission.

Advance Seven Ltd. Registered in England & Wales numbered 2373877 at Endeavour House, Coopers End Lane, Stansted, Essex CM24 1SJ

______________________________________________________________________
This email has been scanned by the Symantec Email Security.cloud service.
For more information please visit http://www.symanteccloud.com
______________________________________________________________________
___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
Archives:    https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request@wireshark.org?subject=unsubscribe