On Tue, May 3, 2011 at 5:06 PM, Igor Stasenko <siguctua@gmail.com> wrote:

On 3 May 2011 16:57, Mariano Martinez Peck <marianopeck@gmail.com> wrote:

...

Instead of discussing where to commit I would discuss how to merge and define the process with VMMaker. I mean, how WE (the community) and Eliot, manage the development of Cog (the VMMaker part).

Take as an example today. There is "our branch" which is in VMMaker-oscog-XXX.NUMBER. For example, the last one is VMMaker-oscog-MarianoMartinezPeck.66. Eliot commits are in (since now) VMMaker.oscog-eem.56. Who merges? Eliot? us? Would Eliot took the result of the merge as his next base version? Because suppose I merge it, and I get VMMaker-oscog-MarianoMartinezPeck.67 which is the merge with VMMaker.oscog-eem.56. Will Eliot take that version and follow his code from that one? or he will release VMMaker.oscog-eem.5N tomorrow, and we will need to merge with VMMaker-oscog-MarianoMartinezPeck.6N? if so, the merge will always be more complicated and the differences will be more and more...

As to me the rule is simple: - before making new release (or snapshot) an author should merge with latest available version.

it means, whoever are responsible for update, he should merge previous work (or just base his work on latest available version).

This btw, a typical rule for group development. I've been followed it since using CVS, then SVN in many other project i were involved. Its simple and straightforward. Why we should invent something else?

Because it is not fun to do the same merge over and over. And the merge will be each time bigger and bigger. This is why I would like to know whether Eliot will take the result of the merge or not as the base of his next version

Okay. So, Mariano, it is your call. Please do the merge eem.56 + MarianoMartinezPeck.66 and then create new ConfigurationOfCog, so next time we will build new VMs based on this version.

mmm I don't promise anything. I don't feel brave enough. My unique commit to VMMaker (.66) was a simple change in VMMakerTool to avoid the WorldMenu. There are more than 10 commits between them and none of them done by me. So...I am not sure I will be able to do it or to do it correctly (as opposite to CMakeVMMaker where I feel more confortable to commit and merge). Moreover one of the commits of Dave changed almost all classes (I am not saying it is bad ehh!!)...so the merge doesn't look easy. I would appreciate if you can take a look this time. Otherwise, I will try to do it along the week. Cheers mariano

Cheers

...

Mariano

-- Best regards, Igor Stasenko AKA sig.

-- Mariano http://marianopeck.wordpress.com