On Aug 6, 2013, at 9:51 PM, Guillermo Polito <[email protected]> wrote:
> > On Tue, Aug 6, 2013 at 9:33 PM, Stéphane Ducasse <[email protected]> > wrote: > I imagine that having a branch is the way to go. > > To me, a branch is a fork in the code. That is, you split and they evolve > differently. If you want to tag a version as stable, you use a tag :). And > git already supports all that. But we don't use it ;). > > However, branches make sense to me if we have for example > > - vm for pharo2 > - vm for pharo3 > - vm …. No necessarily in git a branch can be a features that you experiment with. > With that setup, in the pharo2 branch we can backport fixes from the pharo3 > branch, but they may evolve differently. > And more importantly, we do not need to maintain all the compatibility with > the world. Whoever wants a pharo2 vm, they go to the pharo2 branch, which on > release is freezed (as well as the image). > > Now, in Git, I do not think there is a need for having many repositories for > that. It's enough with branches and tags… Exactly > Like that esteban can integrate the fixes of eliot and you do not stress to > finish. > > Yes, but esteban has already lots of things to do :). And every time I made a > pull request, a had to push it myself into the main branch because if not, > nobody did it. And ask Camillo, he was in the same situation... In the image > side we have Stef, Marcus and Esteban that integrate fixes. In the vm side > it's only Esteban :/. and igor for the Windows one. > Once this is ready there is a merge. > > But that's what happen today, only the naming is bad in the git branch :). > > - We have a stable VM, which you can download as stable. That VM does not > have the latest changes. I do not know if there is a tag, but there should be. > - We have a unstable VM, which we call latest. It has the latest sources > which we should test and prove before "blessing" it as the stable. > > > At least this is what I was thinking the process was: > one main blessed stream > several others at different level of maturity with the ultimate goal to > avoid bottleneck. > > Yes, but with that we lack also a good management of the issue tracking and > stuff :). Above in this thread I was asking where do I submit an issue. Maybe > we should put everything in the pharo issue tracker and be happy with only > one tool. yes in the bug tracker. > BTW, tomorrow I go to lille, we can discuss if you have some minutes :). yes The morning I will be present and working on the textEditor stuff. :)
