Just to be clear. I follow by all passionate argumentation, my vote goes to whatever Jim and Matthias decide. They do releases, and they earned the most kudos on that. I am in whatever makes them happy! I like meritocracy! Even if that leaves me rather at the edge in a lot of topics.
All the best Peter Am 26. Oktober 2017 00:18:25 MESZ schrieb Marcus <marcus.m...@wtnet.de>: >Am 24.10.2017 um 22:25 schrieb Andrea Pescetti: >> I'm starting a short series of occasional posts to capture the >current >> collective state of mind on the next release. I'll float them here >for >> refinement or lazy consensus, and then we may want to reuse this text >in >> wiki or blog posts to avoid repeating the same concepts over and >over. >> >> Let's start with branches. >> >> We all wish 4.1.4 to be the last 4.1.x release. >> >> We currently have an AOO415 branch at >> http://svn.apache.org/viewvc/openoffice/branches/AOO415/ ; this >branch >> is a copy of AOO414 (that resulted in OpenOffice 4.1.4). The AOO415 >> branch will result in a release ONLY if we have some important bug >fixes >> to release and trunk is not ready yet. No new features, even small >> enhancements, are added to it. No commits to AOO415 happen without >> appropriate mailing list discussions (dev or security, depending on >cases). >> >> Trunk is where all development happens. It will be branched for a new > >> release (like, an AOO420 branch - name still provisional) when the >code >> is mature: beta or even RC. Until then, we simply keep working on >trunk >> as we are doing now. >> >> In case we need to commit to a branch, any changes are still >committed >> to trunk first and then merged to branches using SVN merge in all >> situations when this is possible (i.e., when there are no merge >> conflicts). The mergeinfo for AOO414 and AOO415 isn't clear, so we'll > >> have to make sure that trunk contains all fixes done there (or >> equivalent in case of conflicts) and, done that, we commit to AOO415 >> only if: >> 1. The fix is important and agreed upon on the relevant list >> 2. The commit is done with "svn merge" starting from a trunk commit >> >> This will ensure that we can shift the focus to trunk while still >> keeping a branch that remains ready for a quick release if needed. If >we >> are never in this situation, the next release will be from the >current >> trunk and AOO415 will never result in a release. > >"First trunk, then the branch(es)" is not new. I think we are working >already in this way. But just to make it clear. > >so, to keep it short: >I like the proposal. > >Marcus > > >--------------------------------------------------------------------- >To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org >For additional commands, e-mail: dev-h...@openoffice.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org
