<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Mar 30, 2015 at 1:45 PM, David T. Lewis <span dir="ltr"><<a href="mailto:lewis@mail.msen.com" target="_blank">lewis@mail.msen.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class=""><br>
><br>
> No reason other than that I wasn't sure if there is a protocol on how to<br>
> do<br>
> it. Do you just copy'n'paste methods over? Or is there any actual<br>
> branching<br>
> going on? If so, what should I do to keep the history intact?<br>
><br>
<br>
</span>There are two active branches of the VMMaker project. Most of the new<br>
development, led by Eliot, is happening in the Cog/Spur branch. In the<br>
VMMaker repository, this is identified by "VMMaker.oscog" Associated with<br>
this is the Cog branch of the platform sources, which is in Subversion<br>
(see <a href="http://squeakvm.org/cgi-bin/viewvc.cgi/squeak/branches/Cog/" target="_blank">http://squeakvm.org/cgi-bin/viewvc.cgi/squeak/branches/Cog/</a>).<br>
<br>
In addition to the Cog/Spur development, we continue to maintain the trunk<br>
branch of VMMaker. This is identified as "VMMaker" (as opposed to<br>
"VMMaker.oscog" in the repository, and the corresponding Subversion<br>
platform sources are called "trunk" (see<br>
<a href="http://squeakvm.org/cgi-bin/viewvc.cgi/squeak/trunk/" target="_blank">http://squeakvm.org/cgi-bin/viewvc.cgi/squeak/trunk/</a>)<br>
<br>
Wherever possible and practical, we try to keep these branches in sync.<br>
The changes that you are making here are almost certainly something that<br>
we would want to have applied to both.<br></blockquote><div><br></div><div>+1.</div><div><br></div><div>So just copy and paste methods. One way is to take a diff between the two versions of VMMaker that encompass the changes you want to move, use file out to file out all the methods, effectively generating a change set, then use the ChangeList to merge that change set into an image containing VMMaker.oscog, then publish VMMaker.oscog, copying commit comments from the relevant VMMaker version(s).</div><div><br></div><div>Eventually we may get to merge VMMaker into VMMaker.oscog or vice verse, but right now no one has the time.</div><div><br></div><div>And thanks!!</div></div>-- <br><div class="gmail_signature">best,<div>Eliot</div></div>
</div></div>