Hi,
with the email from Eranda Sooriyabandara, for me it is clear we are
confusing our users with our current branching approach.
Refreshing what we discussed back in February/March, and what we claim
at the web page:
http://marmotta.incubator.apache.org/development.html
http://git-scm.com/book/en/Git-Branching-Branching-Workflows
Marmotta uses a branching workflow, where we have a stable
master branch and a unstable develop branch. Besides, optionally
topic branches could be open for some topics/issues, which don’t
necessarily need to be pushed to the public repository.
With the topic branches I thing we are doing quite good in the last
months, nothing to say about that.
But, regarding master vs. develop, not so. I think our error has been to
continue developing always on develop, so it became the de facto master
branch. And, according the branching workflow:
Many Git developers have a workflow that embraces this approach,
such as having only code that is entirely stable in their master
branch — possibly only code that has been or will be released.
They have another parallel branch named develop or next that they
work from or use to test stability — it isn’t necessarily always
stable, but whenever it gets to a stable state, it can be merged
into master.
what we are misunderstanding here in the concept of "stable code".
Besides the wrong merge Sebastian did (see INFRA-6876), we are
considering only releases as stable code. And I thing we should do that
more often. The criteria would need to be discussed, but could be
something as simple as "periodically, if jenkins' builds are stable, all
tests passing and no critical/blocking issues open, we could merge
develop into master". This could be done by any committer, a special
person, or even the release manager, I don't know.
What do you think? This discussions is very important, since it'll
affect how we all are working.
Cheers,
--
Sergio Fernández
Senior Researcher
Knowledge and Media Technologies
Salzburg Research Forschungsgesellschaft mbH
Jakob-Haringer-Straße 5/3 | 5020 Salzburg, Austria
T: +43 662 2288 318 | M: +43 660 2747 925
sergio.fernan...@salzburgresearch.at
http://www.salzburgresearch.at
