[Zlib-devel] vcs workflos [WAS: zlib 1.2.3.6 available for testing]

[Enrico Weigelt]

glennrp at comcast.net wrote:

>      Libpng has 5 GIT branches right now
> 
>         alpha  (libpng-1.5.0alpha01, not yet tarballed)
>         devel  (libpng-1.4.0rcNN, will be 1.5.0beta01)
>         master (libpng-1.4.1beta01, was 1.2.42rcNN)
>         stable (1.2.42)
>         legacy (1.2.43betaNN)

Yep. That's the "classical" branching approach. But that's still
pretty centralized: people working within one branch have to
work very closely together, and moving changesets from one line
of development (eg. devel -> master -> stable) can get a bit tricky
(a lot cherry-picking, etc) and sooner or later you'll need quite
strict milestones, merge-windows, etc.

In MC we're using one branch per issue. Once a issue-branch is
finished, it gets reviewed (at least 2 other devs have to approve)
and after approval it gets rebased to and merged into master.
This has eg. the advantage that unfinished things dont block
finished ones from getting into master (actually, _that_ is was
sucked not just me in lots of other projects, so I started oss-qm
project ;-o) - testing happens on per-issue basis (master just
contigiously runs through a bunch of automatic tests).

>      I probably botched the transfer of libpng-1.4.0
>      from the devel branch to the master branch.  I
>      wound up with an extra copy of the library
>      that doesn't connect to the history in the
>      devel branch.  Same problem with the move of
>      libpng-1.2.42 from master to legacy.

Rebase is your friend ;-p

> BTW: please fix the git url for libpng, has to be:
> git://libpng.git.sourceforge.net/gitroot/libpng/libpng
> (missed the last "/libpng").
> 
>      I assume you speak of the link on the libpng
>      page.  Greg Roelofs maintains that and I've
>      sent him a request to fix it.  Is it wrong
>      elsewhere?

Yep. thx.


cu
-- 
----------------------------------------------------------------------
 Enrico Weigelt, metux IT service -- http://www.metux.de/

 cellphone: +49 174 7066481   email: info at metux.de   skype: nekrad666
----------------------------------------------------------------------
 Embedded-Linux / Portierung / Opensource-QM / Verteilte Systeme
----------------------------------------------------------------------