On Fri, Mar 12, 2010 at 3:28 PM, Latif Khalifa <lati...@streamgrid.net> wrote: > What would be particularly beneficial for LL > if there was some sort of mechanism for merging SG patches back to the > main viewer trunk. That way you get the benefits of excellent work OS > devs have put into fixing bugs in SG. Plus you encourage the OS devs > to provide even more great work (I know many of them felt disappointed > to see that you could crash viewer2 in many ways that were fixed in > SG).
This is going to be a *lot* easier once devs split the server and viewer code apart so these can reside in separate repositories. With mercurial for source control and a cleanly split project, any of continuous updates, full commit history, and frequent merging will be practically free. The open source team definitely understands this need. The big, disruptive reorganization for the split is the difficult part right now. We're all on mercurial internally as of a few weeks ago, which is going to make the rest easier once viewer 2 merges back to trunk. Right now, there's a lot of processing (you wouldn't believe the scripts) to generate the open source drops without server bits mixed in. That's not conducive to bidirectional merging. _______________________________________________ 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
