[Zlib-devel] zlib 1.2.5.1 baseline

[Maarten Bosmans]

2011/9/16 Mark Adler <madler at madler.net>:
> Mike,
>
> Sorry, I didn't read your email carefully enough.  Yes, the master is at 1.2.5, but the develop branch has 1.2.5.1 and commits after that.  I though you were talking about the develop branch, since at the moment you sent your email I was in the middle of deleting and replacing the develop branch.

The standard workflow for git has master as the branch which contains
the latest development code. Specific releases can either be tags on
this master branch or, e.g. when applying security patches for a new
minor release on a brach specific to the release. So you could have a
v1.2.5 branch where you prepare a handful of patches that will because
1.2.5.1, which is just a tag on that release branch and bigger
development takes place in master, in what will eventually become
1.2.6 (or 1.3, whatever you like)

My main point is that the current setup will confuse more people, like
Mike and myself, into thinking that master is the latest code that
should be tested and for patches to be written against.

Maarten