2013/2/10 Dave Abrahams <da...@boostpro.com
> on Sun Feb 10 2013, Beman Dawes <bdawes-AT-acm.org> wrote:
>> In github.com/boostorg
, the branch names are "master" and "release".
>> Weren't we going to follow the gitflow conventions of "master" for
>> releases, and "develop" for trunk?
First of all: Yes, we want to follow the gitflow naming conventions.
Using gitflow, "develop" is the branch where the development happens.
This corresponds to our current svn "trunk". To prepare a release, a
temporary branch is created. This branch receives stabilization fixes
while development may continue on "develop". When the release is
ready, a tag is created. At the same time, all the stabilization fixes
are merged both back to "develop" and to a special branch called
"master". It follows that, at any point in time, "master" will be
In Subversion, we have a branch called "release". However, this branch
does *not* contain the releases, it is where the releases are
*prepared*. The code there is usually not production ready. Calling
this branch "master" could have fatal consequences.
A mapping of the current branches in Subversion to the gitflow
convention is not possible.
But we can still get a gitflow history! To do that, we must map
"trunk" to "develop" and create a supplementary master branch from all
> I'm going to let Daniel explain that one.
Thanks Dave :)