Wireshark-dev: Re: [Wireshark-dev] Branching Question
From: Jaap Keuter <[email protected]>
Date: Thu, 6 Nov 2008 22:28:16 +0100

The first one is more of an enhancement. Since the 1.0 branch is in 'feature freeze' this won't go in. It stays in trunk until a new stable branch is made.
The second looks more like a bugfix to me, but maybe is dependant on the first.


Sent from my iPhone

On 6 nov 2008, at 21:11, "McAtee, Kip" <[email protected]> wrote:



We have a couple of fixes checked in to trunk/epan/dissectors/packet_atm.c (7/15/2008:25743 and 8/6/2008:25944). Neither of these changes are in release 1.0.4, which uses a version or packet_atm.c branched from trunk on 3/17/2008:24396.


What is the procedure for changes to trunk making it to a release? Do we need to ask for them to be merged into trunk-1.0 or will there be a trunk-1.2 coming soon?





E-mail confidentiality.
This e-mail contains confidential and / or privileged information belonging to Spirent Communications plc, its affiliates and / or subsidiaries. If you are not the intended recipient, you are hereby notified that any disclosure, copying, distribution and / or the taking of any action based upon reliance on the contents of this transmission is strictly forbidden. If you have received this message in error please notify the sender by return e-mail and delete it from your system. If you require assistance, please contact our IT department at [email protected].

Spirent Communications plc
Northwood Park, Gatwick Road, Crawley, West Sussex, RH10 9XN, United Kingdom.
Tel No. +44 (0) 1293 767676
Fax No. +44 (0) 1293 767677

Registered in England Number 470893
Registered at Northwood Park, Gatwick Road, Crawley, West Sussex, RH10 9XN, United Kingdom.

Or if within the US,

Spirent Communications,
26750 Agoura Road, Calabasas, CA, 91302, USA.
Tel No. 1-818-676- 2300

Wireshark-dev mailing list
[email protected]