the original message was sent to both the -dev list and the -users list. See https://lists.berlios.de/pipermail/opensim-users/2013-December/012930.html
On Fri, Dec 20, 2013 at 5:23 PM, Justin Clark-Casey < [email protected]> wrote: > On 21/12/13 00:07, BoneZ wrote: > >> Thank you for the updates. >> >> With no disrespect intended here, what/how exactly did the master become >> unusable? >> I thought by using a setup like this (GIT) we would avoid issues like >> this? >> Like I said, I mean no disrespect... just trying to find out what >> happened as it may be a lesson we all can learn from. >> > > The start of the merge was signalled in [1], which was an opensim-dev > message rather than opensim-users. > > Unusable was probably too strong a word in the end. It become unstable > when Melanie started merging her code, a process which should be completed > soon. > > Yes, other ways of using Git would avoid this. In terms of work, this > generates less for those making ongoing incremental changes to master and > more for the person merging in complex patches, since they have to adapt to > any changes made. > > Normally, it would be up to the merger to bear these costs. In this case, > there was negotiation and effective agreement among the core developers to > make an exception. > > [1] http://lists.berlios.de/pipermail/opensim-dev/2013- > December/012096.html > > > >> ~BoneZ >> >> >> >> On 12/20/2013 5:35 PM, Justin Clark-Casey wrote: >> >>> We had the yearly Overte meeting today so I got a chance to talk to >>> Melanie directly. She is looking to put in the >>> rest of the code soon over Christmas and before the New Year and that >>> master should actually be in a reasonable state >>> at the moment, albeit with unpredictable regressions. However, I will >>> leave it to her to post specifically about that >>> (she is planning to) so that I don't muck up the details. >>> >>> In the meantime, anybody looking for a 'stable' level of code may want >>> to look at the git branch "justincc-master". >>> This is branched just before the merge (commit >>> 08750501617ca332ab196b2f25030e3c635c9dd6) and contains various patches >>> from myself and other contributors under normal master conditions. All >>> these changes will also get back into master. >>> Feel free to raise bugs, etc. against this branch. >>> >>> On 20/12/13 20:58, Dahlia Trimble wrote: >>> >>>> Melanie made a few commits but I believe she wanted to do more. I don't >>>> think git master is in a good state and I don't >>>> really know what her commits may have broken. I also don't know when >>>> she plans on completing this work. Perhaps she will >>>> post a message to these lists and let us know what her plans are? >>>> >>>> >>>> >>>> >>>> On Fri, Dec 20, 2013 at 5:37 AM, BoneZ <[email protected] <mailto: >>>> [email protected]>> wrote: >>>> >>>> Hi all, >>>> >>>> Does anyone know if the source code has been fixed? >>>> Last I heard Melanie was merging some code and it was down for some >>>> time? >>>> >>>> I don't recall seeing an update in some time now. >>>> >>>> Thanks, >>>> ~BoneZ >>>> _________________________________________________ >>>> Opensim-users mailing list >>>> [email protected] <mailto:Opensim-users@lists. >>>> berlios.de> >>>> https://lists.berlios.de/__mailman/listinfo/opensim-users < >>>> https://lists.berlios.de/mailman/listinfo/opensim-users> >>>> >>>> >>>> >>>> >>>> _______________________________________________ >>>> Opensim-users mailing list >>>> [email protected] >>>> https://lists.berlios.de/mailman/listinfo/opensim-users >>>> >>>> >>> >>> >> _______________________________________________ >> Opensim-users mailing list >> [email protected] >> https://lists.berlios.de/mailman/listinfo/opensim-users >> >> > > -- > Justin Clark-Casey (justincc) > OSVW Consulting > http://justincc.org > http://twitter.com/justincc > _______________________________________________ > Opensim-users mailing list > [email protected] > https://lists.berlios.de/mailman/listinfo/opensim-users >
_______________________________________________ Opensim-users mailing list [email protected] https://lists.berlios.de/mailman/listinfo/opensim-users
