I vote for removing the master branch. This is in the line of what I was also wondering since we have created branches for 0.60 and 0.70. Branches can remain the source of truth for the release and can facilitate minor releases if needed.
On Wed, Jan 28, 2015 at 8:58 AM, Steve Loughran <ste...@hortonworks.com> wrote: > The latest release process document is now in svn at > site/trunk/content/developing/releasing.md > > It hasn't yet propagated to the HTML view, when it does it will be at > > http://slider.incubator.apache.org/developing/releasing.html > > I think we've outgrown the git flow release process. > > The feature branch seems to work well, but the release process has > everything merged into the branch "master", > > - It doesn't handle long-lived release/supported branches > - Merging into master/ can create convoluted dependency graphs, > resulting a commit graph (and hence git commit ID) which is different > from > what is released. > > What are we to do? > > I'm wondering if we should get rid of that master/ branch altogether. > > Instead we could have some tags which we could move around: > > - last_branch_6_stable_release > - last_branch_6_dev_release > - last_branch_7_stable_release > - last_branch_7_dev_release > - last_stable_release > - last_dev_release > > If you fetch all tags then check out by tag, you end with whatever version > we think is "last" on a branch; the stable/dev releases can even cross > branches as something migrates from development to stable > > During the release process, instead of doing git merge master work, we'd > just delete some tags, create the new ones and then push them to the > origin. > > Thoughts? > > -steve > > -- > CONFIDENTIALITY NOTICE > NOTICE: This message is intended for the use of the individual or entity to > which it is addressed and may contain information that is confidential, > privileged and exempt from disclosure under applicable law. If the reader > of this message is not the intended recipient, you are hereby notified that > any printing, copying, dissemination, distribution, disclosure or > forwarding of this communication is strictly prohibited. If you have > received this communication in error, please contact the sender immediately > and delete it from your system. Thank You. > -- thanks Sumit
