Far too many branches

Question

Far too many branches

StephanEggermont opened this issue 6 years ago · 11 comments

Contributing to Calypso is difficult when it is not clear which branch to push to. Please reduce to the absolute minimum

Answer 1 · 2019-03-24T15:41:25.000Z

Better would maybe be to have a CONTRIBUTION.md file?

Answer 2 · 2019-03-24T15:43:24.000Z

Did you see bold section "Contribution (Pharo 7 and higher)" in readme?

Answer 3 · 2019-03-24T18:08:15.000Z

No. Why is there a dev branch?

Answer 4 · 2019-03-24T19:18:25.000Z

All development is accumulated in dev branch through PRs. When we decide that it is time for release we push dev to master and create a new release tag. In addition we push (or create) to floating branch (0.16.x for example).
This way master is always stable.

You can propose better process. But honestly I don't have time to spend on it.

Answer 5 · 2019-03-24T19:25:47.000Z

Drop dev, do that all in master. No branch that adds no value. Currently, master doesn't.

Answer 6 · 2019-03-24T19:36:09.000Z

I think it has value.
For example loading master gives you latest stable release.

Answer 7 · 2019-03-24T19:42:51.000Z

No, because there is no such thing. Release for what? Stable is different for 7 and for 8.

Answer 8 · 2019-03-24T19:53:30.000Z

I wonder about your No. It sounds like I ask you how it works and you explain me how. But it seems I am explaining you how it is done :) Stable is same for Pharo 7 and 8. At least for now. But in general you can consider master as a latest stable version for supported Pharo versions. вс, 24 мар. 2019 г. в 19:42, Stephan Eggermont <notifications@github.com>:

…

No, because there is no such thing. Release for what? Stable is different for 7 and for 8. — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#473 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AHxaoIm8CXlrzim_BBIZ0Fwse722PTqHks5vZ9U7gaJpZM4cFkd9> .

Answer 9 · 2019-03-24T20:04:48.000Z

Sorry, that’s because I’ve been fighting bad dependency management in Pharo for the past five years or so, and this exact problem cost a client of mine about 30 man months two years ago.

Answer 10 · 2019-03-25T00:54:52.000Z

I work with master and dev branch on projects that have more than 75 dependencies without problem from that kind of management. For me the problem does not comes from there.

Answer 11 · 2019-03-25T06:03:57.000Z

It just creates extra work and confusion. The absolute number of dependencies is only a small part of it. On which branches should Pharo 7 and 8 depend?