does boost follows the git-flow schema, e.g. merging the changes from branch develop into master is not required by the library developer (this is done by the release manager)?! Oliver
On Wednesday 22 January 2014 17:42:49 Oliver Kowalke wrote:
does boost follows the git-flow schema, e.g. merging the changes from branch develop into master is not required by the library developer (this is done by the release manager)?!
Library maintainers must perform the merge. In terms of git-flow they are the release managers (of their respective libraries).
Le 22/01/14 17:46, Andrey Semashev a écrit :
On Wednesday 22 January 2014 17:42:49 Oliver Kowalke wrote:
does boost follows the git-flow schema, e.g. merging the changes from branch develop into master is not required by the library developer (this is done by the release manager)?! Library maintainers must perform the merge. In terms of git-flow they are the release managers (of their respective libraries).
yes but git-flow uses an intermediary release branch to merge from develop to master " When you're feature complete, simply start a release branch --- again, based on |develop| --- to bump the version number and fix the last bugs before releasing: |$ git flow release start v0.1.0| When you finish a release branch, it'll merge your changes to |master| /and/ back to |develop|, so you don't have to worry about your |master| being ahead of |develop|. " IMO, the regression test should use these release branches for each one of the boost modules, as the developer has no means to check it before finishing the release. The release finish should IMO be done when we want to do the fist beta release. As we don't have this flow, does it mean that the developer must do a |git flow release start v0.1.0| |git flow release finish v0.1.0| Best, Vicente
On Wed, Jan 22, 2014 at 5:42 PM, Oliver Kowalke
does boost follows the git-flow schema, e.g.
See https://svn.boost.org/trac/boost/wiki/StartModWorkflow
merging the changes from branch develop into master is not required by the library developer (this is done by the release manager)?!
If my understanding is correct, once you merge a branch into master in the library repository, the change will be reported into the develop branch of the super repository. Which basically means that it's automated.
Oliver Kowalke wrote:
does boost follows the git-flow schema,
Yes...
e.g. merging the changes from branch develop into master is not required by the library developer (this is done by the release manager)?!
No, merging from submodule:develop to submodule:master is done by the library developer. Every such merge, per git-flow, is considered a stable library (submodule) release (not a Boost release). Boost releases and superproject merges are done by the release managers based on the submodule master branches. If a submodule never merges to master, the changes to it will never appear in a Boost release (as was the case in the old SVN days).
participants (5)
-
Andrey Semashev -
Klaim - Joël Lamotte -
Oliver Kowalke -
Peter Dimov -
Vicente J. Botet Escriba