| Re: [papyrus-rt-dev] Feature freeze and git repo |
|
Hi, In Papyrus, we don’t switch branches until the final release (Which is RC4 for us). Any new feature is postponed (e.g.
pending on Gerrit) until the release is complete. This is mainly to avoid reconfiguring the build & scripts due to switching branches. We’re however experimenting a new approach this year: we’ve created a new branch after Feature Freeze (M7), for the next
release. This is a temporary branch, that will be rebased to master after the final release (RC4). Once the branch is rebased, the current master will be renamed to maintenance, and the rebased branch will become the new master The point with this approach is to be able to push new features on a dedicated branch, where we can have complete builds/validation,
and we can merge several features on the same branch to identify conflicts early, without changing the current structure for the master branch (Same branch name, same build configuration...) We don’t have too many contributions on this new branch, so it’s hard to tell whether it was useful at all. In general,
at this time, we should be focusing on bug fixes anyway; not on features for the next yearly release. So, I’d say, new branches can wait :) but it really depends on your plans and contributions Regards, De : papyrus-rt-dev-bounces@xxxxxxxxxxx [mailto:papyrus-rt-dev-bounces@xxxxxxxxxxx]
De la part de Ernesto Posse Hello everyone. Since we have feature freeze this Friday, I was wondering how are we going to deal with it in the git repo. Are we going to create a "1.0.0" branch and continue 1.0.1 development on master, or are we going to create a "1.0.1" branch and
let master be 1.0.0 with only bug fixes committed on it, or something else? What does Papyrus do? -- Ernesto Posse Zeligsoft |