[dpdk-dev] development/integration branch?

[Thomas Monjalon]

2014-10-21 08:36, Richardson, Bruce:
> From: Marc Sune
> > Some DPDK users, including myself, use a clone of the git repository to
> > compile DPDK for their applications, instead of downloading the tarball
> > of each release.
> > 
> > In my opinion, it would be useful for such users that the master branch
> > contains only stable releases, to prevent (mistakenly) to use a wip DPDK
> > version, and jump quickly to the latest stable with a simple git pull
> > without having to check the tags. Also new users would clone the repo
> > and get only the stable release.
> > 
> > So I would propose to use an integration/development branch, where the
> > patches are integrated and only push to master once a stable release is
> > tagged in this integration branch.
> > 
> > Thoughts?
> 
> Ideally, our master branch should always be good and stable, but given
> reality often interferes with such good intentions I think that having
> dev branches is not a bad idea. However, what we may lose by doing so
> is having a larger group of people constantly using the master branch
> and reporting problems to us. 
> 
> On balance, I'd be slightly in favour of this suggestion.

My balance is different because I have a simpler solution for Marc's problem:
	git fetch && git merge $(git tag | grep -v -- -rc | tail -n1)

-- 
Thomas