Hi, Last week, I landed a big merge with viewer-external creating the svn r3349 commit. That was a sync with viewer-public which is now in its 2.0.2 phase.
This commit resulted in a bunch of problems for lots of you building standalone (see previous emails from Lance, Wolfpup, Boroondas and others) and just some plain unstable behaviors in the trunk (see http://jira.secondlife.com/browse/SNOW-658). This is hampering the progress on merging back Snowglobe 1.x features to the Snowglobe 2.0 trunk and pushes the availability of this release even further. We discussed this situation at the last Hippo meeting Thursday and thought that it was may be time to hit "pause" on merges from viewer-public into the Snowglobe 2.x trunk so that we can complete that 1.x merge back. We informally agreed on the following: - roll back r3349 and stay put with the stable 2.0.1 code base - merge all 1.x commits into trunk - release SG 2.0.1 then resume merging viewer-external into trunk (2.0.2 or whatever viewer-external will be at that time) One ancillary task to this plan was that I would make a "1.x to 2.0 port" spreadsheet available and here it is: https://spreadsheets.google.com/ccc?key=0AgvC7hm5YZqcdHVXb05iTE0wTFc0bWptTW4tOTZuS3c&hl=en This plan will not change anything to viewer-external syncing schedule so we'll continue to see viewer-public changes and, potentially, cherry pick things from there if it makes sense (as little as possible though since the whole idea of pausing merges is to work off a stable 2.0.1). The "pros" are pretty obvious (rather quick convergence on a Snowglobe 2.0 that's releasable) though the big "con" is that we'll face yet another big merge later. Being the one doing the merges though, I somewhat prefer that solution (doing one serious merge later rather than suffering through start/stop due to build breakage till SG 2.0 release). I'm planning to do this roll back tomorrow (Tuesday May 18th) so, please, speak up before if you feel this is a bad plan. Cheers, - Merov
_______________________________________________ Policies and (un)subscribe information available here: http://wiki.secondlife.com/wiki/OpenSource-Dev Please read the policies before posting to keep unmoderated posting privileges