search

tigase / tigase-server

(M) Highly optimized, extremely modular and very flexible XMPP/Jabber server
https://tigase.net
GNU Affero General Public License v3.0
326 stars 106 forks source link

code differences between v7.1.5 and v7.1.7 #144

Closed davidemarrone closed 2 years ago

davidemarrone commented 2 years ago

difference between v7.1.5 and v7.1.7 I was checking the difference between v7.1.5 and v7.1.7

The diff between v7.1.6 and v7.1.7 are very clear https://github.com/tigase/tigase-server/compare/tigase-server-7.1.6...tigase-server-7.1.7

but the diff between v7.1.5 and v7.1.6 are a bit strange: https://github.com/tigase/tigase-server/compare/tigase-server-7.1.5...tigase-server-7.1.6 the v7.1.5 was released on 24 jan 2019, why in the v7.1.6 are included a lots of backport from commits of previous years?

woj-tek commented 2 years ago

Hi and thank you for bringing this to our attention. This was due to our previous policy of maintaining stable and old-stable branches (which resulted in merge of previous branches of those sorts and in the end of observed result): Comparing tigase-server-7 1 5 tigase-server-7 1 6 · tigase_tigase-server -- for comparison

Since then we adopted approach to maintain tigase-server-<major>.<minor>.x branches for bugfixes, which makes it easier to handle.

I corrected tigase-server-7.1.x branch to only include relevant commits without the merge (and screenshot above for context) which "straighten" the commit history. Release archives have been re-created and re-uploaded as well (hence different build number).

Last but not least, please keep in mind that 7.1.x release has been originally made over 5 years ago and we urge everyone to migrate to more recent stable/GA releases.