[Zlib-devel] zlib 1.2.5.1 baseline

[Mark Adler]

On Sep 18, 2011, at 5:49 PM, Jonathan Nieder wrote:
> They're consistent.  The Pro Git book suggests that the master branch
> contains "only code that has been or will be released" --- I think
> your "develop" branch is intended to meet that description.

Are we reading the same thing?

The full text is:

"Many Git developers have a workflow that embraces this approach, such as having only code that is entirely stable in their master branch — possibly only code that has been or will be released. They have another parallel branch named develop or next that they work from or use to test stability — it isn’t necessarily always stable, but whenever it gets to a stable state, it can be merged into master."

That is exactly what I have set up.  When we apply patches from whoever or wherever, the code is most certainly not "entirely stable".  The only code I would consider entirely stable is what this group has tested as best they can before a major release.  In fact, that is one of the major purposes of this group, where no one person can test on all of the myriad of platforms that zlib has been deployed on.  Anything in between stable releases is in develop for what we "work from or use to test stability".    When we have done the testing and get to a stable 1.2.6, then develop can be "merged into master".

Am I completely misreading this?

Mark