<br><br><div class="gmail_quote">On Sun, Mar 20, 2011 at 11:23 AM, Tobias Pape <span dir="ltr"><<a href="mailto:Das.Linux@gmx.de">Das.Linux@gmx.de</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<br>
Am 2011-03-20 um 19:17 schrieb Eliot Miranda:<br>
<div><div></div><div class="h5"><br>
><br>
><br>
> On Sun, Mar 20, 2011 at 11:15 AM, Tobias Pape <<a href="mailto:Das.Linux@gmx.de">Das.Linux@gmx.de</a>> wrote:<br>
><br>
> Am 2011-03-20 um 19:09 schrieb Eliot Miranda:<br>
><br>
> > -------<br>
> > Name: VMMaker-oscog.52<br>
> > Author: IgorStasenko<br>
> > Time: 18 March 2011, 12:45:14 am<br>
> > UUID: a2810aac-4423-6740-b70e-7e821b979cb4<br>
> > Ancestors: VMMaker-oscog-IgorStasenko.50,<br>
> > VMMaker-oscog-EstebanLorenzano.50, VMMaker-oscog.51<br>
> ><br>
> > Merge with oscog-49-51 & Esteban-50<br>
> > -------<br>
> ><br>
> > I feel like you continuously ignoring my requests to merge the code<br>
> > base.. and work together on merged instance<br>
> > of VMMaker.<br>
> > If you don't like this code, just say it. But don't ignore.<br>
> ><br>
> > Its not intentional. It's simply a matter of finding time to do the merge. Mariano posted a bug. I fixed just that bug and published. I'm not dissing you. I have very limited time.<br>
> ><br>
><br>
> Hmm, wouldn't applying the “default” naming scheme prevent such overwrites?<br>
><br>
> That is, now there would be<br>
> VMMaker-oscog-eem.52<br>
> for Elliots version and<br>
> VMMaker-oscog-IgorStasenko.52<br>
> for Igors version.<br>
> What would prevent us from that?<br>
><br>
> I don't see a naming conflict. I've been using VMMaker-oscog.NN since the beginning and Igor has been using VMMaker-oscog-IgorStasenko.NN. This isn't about names, it's about content. Igor is miffed I didn't merge in some changes he made when I published VMMaker-oscog.52, right Igor?<br>
><br>
<br>
</div></div>No, you—obviously accidentally—overwrote his version of the 18th of March:<br></blockquote><div><br></div><div>So how did Monticello allow me to do that? That's a /bad/ bug.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<div class="im"><br>
>>><br>
Name: VMMaker-oscog.52<br>
Author: IgorStasenko<br>
Time: 18 March 2011, 12:45:14 am<br>
UUID: a2810aac-4423-6740-b70e-7e821b979cb4<br>
Ancestors: VMMaker-oscog-IgorStasenko.50, VMMaker-oscog-EstebanLorenzano.50, VMMaker-oscog.51<br>
<br>
Merge with oscog-49-51 & Esteban-50<br>
<<<<<br>
<br>
</div>which has the same file name as yours:<br>
<br>
>>><br>
Name: VMMaker-oscog.52<br>
<div class="im">Author: eem<br>
Time: 20 March 2011, 9:31:20 am<br>
UUID: 1241a856-8570-4725-a069-a6d3d8a8a222<br>
Ancestors: VMMaker-oscog.51<br>
<br>
Fix primitiveFlushCacheByMethod for objects-as-methods.<br>
<<<<<br>
<br>
</div>Since oscog is, as far as I can see, a kind-of branch of the<br>
“default” VM-Maker, I think adding the developer initial/name to<br>
the Package name would be in the spirit of monticello idioms.<br></blockquote><div><br></div><div>Except that its my branch and I've been using oscog from the start. Igor had no need to use the same name line as me. I don't want to change now. oscog refers to my branch of VMMaker for "open source Cog".</div>
<div><br></div><div>cheers</div><div>Eliot</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<br>
So Long,<br>
<font color="#888888"> -Tobias<br>
<br>
<br>
<br>
</font></blockquote></div><br>