<div dir="ltr">the original message was sent to both the -dev list and the -users list. See <a href="https://lists.berlios.de/pipermail/opensim-users/2013-December/012930.html">https://lists.berlios.de/pipermail/opensim-users/2013-December/012930.html</a><br>
</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Dec 20, 2013 at 5:23 PM, Justin Clark-Casey <span dir="ltr"><<a href="mailto:jjustincc@googlemail.com" target="_blank">jjustincc@googlemail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="im">On 21/12/13 00:07, BoneZ wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Thank you for the updates.<br>
<br>
With no disrespect intended here, what/how exactly did the master become unusable?<br>
I thought by using a setup like this (GIT) we would avoid issues like this?<br>
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.<br>
</blockquote>
<br></div>
The start of the merge was signalled in [1], which was an opensim-dev message rather than opensim-users.<br>
<br>
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.<br>
<br>
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.<br>
<br>
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.<br>
<br>
[1] <a href="http://lists.berlios.de/pipermail/opensim-dev/2013-December/012096.html" target="_blank">http://lists.berlios.de/<u></u>pipermail/opensim-dev/2013-<u></u>December/012096.html</a><div class="HOEnZb"><div class="h5">
<br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
~BoneZ<br>
<br>
<br>
<br>
On 12/20/2013 5:35 PM, Justin Clark-Casey wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
We had the yearly Overte meeting today so I got a chance to talk to Melanie directly. She is looking to put in the<br>
rest of the code soon over Christmas and before the New Year and that master should actually be in a reasonable state<br>
at the moment, albeit with unpredictable regressions. However, I will leave it to her to post specifically about that<br>
(she is planning to) so that I don't muck up the details.<br>
<br>
In the meantime, anybody looking for a 'stable' level of code may want to look at the git branch "justincc-master".<br>
This is branched just before the merge (commit 08750501617ca332ab196b2f25030e<u></u>3c635c9dd6) and contains various patches<br>
from myself and other contributors under normal master conditions. All these changes will also get back into master.<br>
Feel free to raise bugs, etc. against this branch.<br>
<br>
On 20/12/13 20:58, Dahlia Trimble wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
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<br>
really know what her commits may have broken. I also don't know when she plans on completing this work. Perhaps she will<br>
post a message to these lists and let us know what her plans are?<br>
<br>
<br>
<br>
<br>
On Fri, Dec 20, 2013 at 5:37 AM, BoneZ <<a href="mailto:bonez@dogzhouse.com" target="_blank">bonez@dogzhouse.com</a> <mailto:<a href="mailto:bonez@dogzhouse.com" target="_blank">bonez@dogzhouse.com</a>>> wrote:<br>
<br>
Hi all,<br>
<br>
Does anyone know if the source code has been fixed?<br>
Last I heard Melanie was merging some code and it was down for some time?<br>
<br>
I don't recall seeing an update in some time now.<br>
<br>
Thanks,<br>
~BoneZ<br>
______________________________<u></u>___________________<br>
Opensim-users mailing list<br>
<a href="mailto:Opensim-users@lists.berlios.de" target="_blank">Opensim-users@lists.berlios.de</a> <mailto:<a href="mailto:Opensim-users@lists.berlios.de" target="_blank">Opensim-users@lists.<u></u>berlios.de</a>><br>
<a href="https://lists.berlios.de/__mailman/listinfo/opensim-users" target="_blank">https://lists.berlios.de/__<u></u>mailman/listinfo/opensim-users</a> <<a href="https://lists.berlios.de/mailman/listinfo/opensim-users" target="_blank">https://lists.berlios.de/<u></u>mailman/listinfo/opensim-users</a><u></u>><br>
<br>
<br>
<br>
<br>
______________________________<u></u>_________________<br>
Opensim-users mailing list<br>
<a href="mailto:Opensim-users@lists.berlios.de" target="_blank">Opensim-users@lists.berlios.de</a><br>
<a href="https://lists.berlios.de/mailman/listinfo/opensim-users" target="_blank">https://lists.berlios.de/<u></u>mailman/listinfo/opensim-users</a><br>
<br>
</blockquote>
<br>
<br>
</blockquote>
<br>
______________________________<u></u>_________________<br>
Opensim-users mailing list<br>
<a href="mailto:Opensim-users@lists.berlios.de" target="_blank">Opensim-users@lists.berlios.de</a><br>
<a href="https://lists.berlios.de/mailman/listinfo/opensim-users" target="_blank">https://lists.berlios.de/<u></u>mailman/listinfo/opensim-users</a><br>
<br>
</blockquote>
<br>
<br></div></div><div class="im HOEnZb">
-- <br>
Justin Clark-Casey (justincc)<br>
OSVW Consulting<br>
<a href="http://justincc.org" target="_blank">http://justincc.org</a><br>
<a href="http://twitter.com/justincc" target="_blank">http://twitter.com/justincc</a><br></div><div class="HOEnZb"><div class="h5">
______________________________<u></u>_________________<br>
Opensim-users mailing list<br>
<a href="mailto:Opensim-users@lists.berlios.de" target="_blank">Opensim-users@lists.berlios.de</a><br>
<a href="https://lists.berlios.de/mailman/listinfo/opensim-users" target="_blank">https://lists.berlios.de/<u></u>mailman/listinfo/opensim-users</a><br>
</div></div></blockquote></div><br></div>