search

pharo-ide / Calypso

Pharo system browser
http://dionisiydk.blogspot.com/2017/07/calypso-update-many-improvements-and.html
MIT License
38 stars 21 forks source link

Far too many branches #473

Open StephanEggermont opened 5 years ago

StephanEggermont commented 5 years ago

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

jecisc commented 5 years ago

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

dionisiydk commented 5 years ago

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

StephanEggermont commented 5 years ago

No. Why is there a dev branch?

dionisiydk commented 5 years ago

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.

StephanEggermont commented 5 years ago

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

dionisiydk commented 5 years ago

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

StephanEggermont commented 5 years ago

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

dionisiydk commented 5 years ago

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 https://github.com/pharo-ide/Calypso/issues/473#issuecomment-475992670, or mute the thread https://github.com/notifications/unsubscribe-auth/AHxaoIm8CXlrzim_BBIZ0Fwse722PTqHks5vZ9U7gaJpZM4cFkd9 .

StephanEggermont commented 5 years ago

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.

jecisc commented 5 years ago

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.

StephanEggermont commented 5 years ago

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?