Re: [Wireshark-dev] How to transfer change in dissector from master to current branch?

[Jirka Novak]

Hi Roland,

> Usually only bugfixes and minor features are added to the master branch.
> In your case, you changed the RTP dissector quite a lot (judging from
> your patch https://code.wireshark.org/review/#/c/29129/) and most of
> those seem to be the implementation of new features, not bugfixes.
> Therefore I do not think merging them to the master would follow the
> guideline for merging to the master branch.

you are right I changed the code significantly. On the other hand it was
just refactoring before I was able to add decoding of a new items in
RTP/ED-137 which is minor feature adding :-)
OK, I will wait. Thank you for clarification.

Best regards,

Jirka Novak
___
Sent via:Wireshark-dev mailing list 
Archives:https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe

Re: [Wireshark-dev] How to transfer change in dissector from master to current branch?

[Roland Knall]

Hi

Usually only bugfixes and minor features are added to the master branch. In
your case, you changed the RTP dissector quite a lot (judging from your
patch https://code.wireshark.org/review/#/c/29129/) and most of those seem
to be the implementation of new features, not bugfixes. Therefore I do not
think merging them to the master would follow the guideline for merging to
the master branch.

kind regards
Roland

Am Fr., 21. Sep. 2018 um 08:23 Uhr schrieb Jirka Novak :

> Hi,
>
>   I made multiple/incremental changes in a dissector and I made it in
> master branch. Changes were merged and are part of development build and
> works.
>   As changes do not depend on any new feature in master and are just
> update of the dissector, I wish to make them available to current stable
> branch.
>   How to do so? Should I commit it as one big patch again?
>
> Best regards,
>
> Jirka Novak
> ___
> Sent via:Wireshark-dev mailing list 
> Archives:https://www.wireshark.org/lists/wireshark-dev
> Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
>  mailto:wireshark-dev-requ...@wireshark.org
> ?subject=unsubscribe
___
Sent via:Wireshark-dev mailing list 
Archives:https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe