This document is clear. Actually now our master branch play the actor of the "develop" branch in the document.
As the document says, "The *master branch* tracks released code only. The only commits to *master* are merges from *release branches* and *hotfix branches*." Then the responsibility of "master" and "dev" is clear. If so, I agree to use this model. By the way, if so, I think the "master" branch just is used to tell us what the codes are in the latest tag. E.g., there is no difference between the master branch and tag v1.1.0 in the last example of the document. Best, ----------------------------------- Xiangdong Huang School of Software, Tsinghua University 黄向东 清华大学 软件学院 Julian Feinauer <[email protected]> 于2019年3月11日周一 上午12:07写道： > Full ack... See the explanation in > https://datasift.github.io/gitflow/IntroducingGitFlow.html > > I suggest that we start a vote to move over to such a branching / > development model. > > Julian > > Von meinem Mobiltelefon gesendet > > > -------- Ursprüngliche Nachricht -------- > Betreff: Re: Do we have a plan to release the first normal version of > IoTDB this month? > Von: 吴晟 Sheng Wu > An: dev ,dev > Cc: > > > But I find that it seems the branch does not have effect... Normally, If > a > PR pass all CI test (if the CI test is enough complete), then if we merge > it into the master, we can guarantee the master is also stable > > This is how the dev branch work. CI can guarantee the stable just in > theory. Unless you have very complex e2e tests in many many scenarios. > > > The release branch is more about do release testing and bug fixed there > before release. After release done, merge to master and release branch > become inactive, unless hotfix release is required. > > > This is my suggestion and my prefer way to run project. > > > > Sheng Wu > Apache SkyWalking, ShardingSphere, Zipkin > > From Wu Sheng 's phone. > > > ------------------ Original ------------------ > From: Xiangdong Huang <[email protected]> > Date: Sun,Mar 10,2019 11:44 PM > To: dev <[email protected]> > Subject: Re: Do we have a plan to release the first normal version of > IoTDB this month? > > > > Hi, > > Agree. I once wanted to maintain a branch called `dev`, so we can submit > PRs to the `dev` branch, and then merge `dev` into `master`.. (actually > `dev` branch exists on github repo now...) > > But I find that it seems the branch does not have effect... Normally, If a > PR pass all CI test (if the CI test is enough complete), then if we merge > it into the master, we can guarantee the master is also stable.. So I do > not maintain the dev branch anymore.. > > Best, > > ----------------------------------- > Xiangdong Huang > School of Software, Tsinghua University > > 黄向东 > 清华大学 软件学院 > > > Julian Feinauer <[email protected]> 于2019年3月10日周日 下午5:57写道： > > > Hi Chris, > > > > I think there is slight confusion. Currently iotdb has no develop and > only > > master branch where development happens. > > Thus I suggest to create the file there (as done in my PR #91). > > > > Julian > > > > Von meinem Mobiltelefon gesendet > > > > > > -------- Ursprüngliche Nachricht -------- > > Betreff: Re: Do we have a plan to release the first normal version of > > IoTDB this month? > > Von: Christofer Dutz > > An: [email protected] > > Cc: > > > > In other projects, we usually have release notes also in develop. Here we > > have a section for the next planned version right at the top (but with an > > "unreleased" appended to the version) and add stuff as it comes in. For a > > release the "unreleased" is removed and merged to master, then a new > entry > > for the next version is added. > > > > Chris > > > > Outlook für Android<https://aka.ms/ghei36> herunterladen > > > > ________________________________ > > From: 吴晟 Sheng Wu <[email protected]> > > Sent: Sunday, March 10, 2019 4:53:00 AM > > To: dev; dev > > Subject: Re: Do we have a plan to release the first normal version of > > IoTDB this month? > > > > Hi. > > > > > > Release note should be kept in master or further codes, I think. Users > may > > be interesting in the changes of old versions, in order to choose right > > version. > > And, make sense to create a new branch to do release, and versiob update. > > You could make the version to 0.9.0-snapshot, after the release branch > > created. > > > > > > > > Sheng Wu > > Apache SkyWalking, ShardingSphere, Zipkin > > > > From Wu Sheng 's phone. > > > > > > ------------------ Original ------------------ > > From: Xiangdong Huang <[email protected]> > > Date: Sun,Mar 10,2019 11:48 AM > > To: dev <[email protected]> > > Subject: Re: Do we have a plan to release the first normal version of > > IoTDB this month? > > > > > > > > Hi, > > > > Do we put this release note into the master branch, or create a new > branch > > called branch-0.8.0 and put this note into that branch? > > (In the pom file of the master branch, the version is still > > 0.8.0-SNAPSHOT) > > > > Best, > > > > ----------------------------------- > > Xiangdong Huang > > School of Software, Tsinghua University > > > > 黄向东 > > 清华大学 软件学院 > > > > > > Julian Feinauer <[email protected]> 于2019年3月10日周日 上午4:07写道： > > > > > Hi all, > > > > > > I just prepared the initial version of the RELEASE_NOTES as PR in [1]. > > > I just integrated all closed Jira issues. > > > Now we should try to add all further (mentionable) improvements. > > > Personally, I think this is not to crucial as this is the first apache > > > release, so the question "what changed" or what changed incompatible is > > not > > > that crucial as for further releases. > > > > > > Best > > > Julian > > > > > > https://github.com/apache/incubator-iotdb/pull/91 > > > > > > Am 09.03.19, 11:48 schrieb "Justin Mclean" <[email protected]>: > > > > > > Hi, > > > > > > > In brief, there are four steps: (1) setting Maven configuration; > > (2) > > > > creating the release branch and prepare the codebase; (3) mvn > > > release and > > > > deploy and so on; (4) vote. > > > > > > You also need to check the LICENSE, NOTICE and DISCLAIMER files in > > the > > > release and we can help you with that. > > > > > > Thanks, > > > Justin > > > > > > > > >
