[Pharo-project] SVN vs Git for the cogvm

Igor Stasenko siguctua at gmail.com
Tue May 3 17:06:49 CEST 2011

On 3 May 2011 16:57, Mariano Martinez Peck <marianopeck at 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?

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

> Cheers
> Mariano

Best regards,
Igor Stasenko AKA sig.

More information about the Pharo-project mailing list