Wireshark-dev: Re: [Wireshark-dev] Fix lost in trunk-1.0?

From: Jaap Keuter <jaap.keuter@xxxxxxxxx>
Date: Wed, 02 Jul 2008 06:46:54 +0200

Hi,

The trunk-1.0 tree is fed from the main trunk by hand. Bugfixes are selected for porting from the development trunk to the released trunk. Once enough fixes are ported a maintenance release is created, like 1.0.1 is a maintenance release of 1.0.0.

There is a significant difference between a fix and an enhancement. A fix is implemented functionality made to work correctly, while an enhancement extends functionality.

The revisions 24833 and 25146 show this difference. Revision 24833 states: "This patch improves MIKEY support in Wireshark", so qualifies as an enhancement. Revision 25146 states: "Fix for bug 2481: Remove debug code", so qualifies as a bugfix.

This leads to revision 25146 being ported to the maintenance release, while revision 24833 remains in the development tree, which will be released later on.

Thanx,
Jaap

David Bernard wrote:

How do you proceed to sync the trunk-1.0 with the main trunk? Because I fear that a fix has been lost in the process.

If you compare the epan/dissectors/packet-mikey.c file between the main trunk and the trunk-1.0, you can see the revision 24833 is missing in the trunk-1.0, even if a newer revision (25146) has been ported to the trunk-1.0. So it seems to me a revision has been forgotten in the syncing process between the main trunk and the 1.0 trunk.

Regards,
David