On Sun, Mar 20, 2011 at 11:23 AM, Tobias Pape <Das.Linux@gmx.de> wrote:

Am 2011-03-20 um 19:17 schrieb Eliot Miranda:

>
>
> On Sun, Mar 20, 2011 at 11:15 AM, Tobias Pape <Das.Linux@gmx.de> wrote:
>
> Am 2011-03-20 um 19:09 schrieb Eliot Miranda:
>
> > -------
> > Name: VMMaker-oscog.52
> > Author: IgorStasenko
> > Time: 18 March 2011, 12:45:14 am
> > UUID: a2810aac-4423-6740-b70e-7e821b979cb4
> > Ancestors: VMMaker-oscog-IgorStasenko.50,
> > VMMaker-oscog-EstebanLorenzano.50, VMMaker-oscog.51
> >
> > Merge with oscog-49-51 & �Esteban-50
> > -------
> >
> > I feel like you continuously ignoring my requests to merge the code
> > base.. and work together on merged instance
> > of VMMaker.
> > If you don't like this code, just say it. But don't ignore.
> >
> > 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.
> >
>
> Hmm, wouldn't applying the �default� naming scheme prevent such overwrites?
>
> That is, now there would be
> � � � �VMMaker-oscog-eem.52
> for Elliots version and
> � � � �VMMaker-oscog-IgorStasenko.52
> for Igors version.
> What would prevent us from that?
>
> 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?
>

No, you�obviously accidentally�overwrote his version of the 18th of March:

So how did Monticello allow me to do that? �That's a /bad/ bug.

>>>
Name: VMMaker-oscog.52
Author: IgorStasenko
Time: 18 March 2011, 12:45:14 am
UUID: a2810aac-4423-6740-b70e-7e821b979cb4
Ancestors: VMMaker-oscog-IgorStasenko.50, VMMaker-oscog-EstebanLorenzano.50, VMMaker-oscog.51

Merge with oscog-49-51 & �Esteban-50
<<<<

which has the same file name as yours:

>>>
Name: VMMaker-oscog.52
Author: eem
Time: 20 March 2011, 9:31:20 am
UUID: 1241a856-8570-4725-a069-a6d3d8a8a222
Ancestors: VMMaker-oscog.51

Fix primitiveFlushCacheByMethod for objects-as-methods.
<<<<

Since oscog is, as far as I can see, a kind-of branch of the
�default� VM-Maker, I think adding the developer initial/name to
the Package name would be in the spirit of monticello idioms.

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".

cheers
Eliot

So Long,
� � � �-Tobias