[crossfire] Reminder: Release 1.11 forthcoming (On GTK V2 Client )

[Mark Wedel]

Kevin R. Bulgrien wrote:

> As the recent spate of commits illustrates, I think it ironic that the
> branch is being touted as stable.  The volume of bug fixes on trunk that
> were not applied to branch was quite high.  At some point it may be helpful
> to realize that the branch is freezing in a broken state.

  Thanks for all your work on backporting your changes.

  Clearly, something isn't working right in the process - bug fixes made to the 
trunk should be backported to the stable version.  But I'm as guilty as anyone 
else for not doing it.

  But, this seems to work fine for the server - I haven't looked, but it seems 
bugfixes are backported more there.

  One reason could be the perception that the trunk client is the one that 
can/should be released, where that really isn't the case for the server (things 
are more in flux there with combat changes).  In retrospect, it may have (and 
would be) better to treat the trunk client as the official & stable client, and 
branch from that for releases.  If big changes are expected to be made, then 
perhaps do a branch before those changes to have an established stable version 
for release.  But this does require more careful monitoring of changes made to 
the client to make sure something hasn't been changed that will make it unable 
to work against 1.x servers.

  The point of trunk was pretty clear - place to be able to make big changes 
without having to worry about breaking things in short term (or backwards 
compatibility long term) - I think that is clearly good.  Some big changes, like 
making the client use libglade, was a big (and good) change, but I think in 
short term, was something that needed to be done apart from the stable branch.

  so I rambled a bit here without really saying much.  I think it does make 
sense for what is currently trunk to become the 'new' stable branch, as lots of 
good changes have been made.  I'm just not sure how things will keep in sync 
going forward so this doesn't happen again.