How semantic versioning goes into git workflow

Question

I am currently having problems with semantic versioning with git.

We use the git version model at http://nvie.com/posts/a-successful-git-branching-model/

We would also like to follow the principles of semantic versioning outlined at http://semver.org/

Here is a usage example for us.

Release branch: ----1----2----3----4 <- tag v1.2 ----7---8---9 <- tag v1.3 / \ / \ Develop branch: --0--------5---------4--6-----------------------------9-- 

Here is our usage example:

• Development takes place in parallel with release and development
• The release is ready to go, we mark it as v1.2. We are generating release notes for changes 1, 2, 3, 4.
• We combine release for development.
• When we are ready to develop a new version again, we can. However, the v1.2 tag points to 4, so release notes for 5 are effectively lost if we request changes between v1.2 and v1.3

What we would like to do is to search for all recently added checks, since the v1.2 tag was created, which was recently included in the v1.3 tag, so that we can determine what type of bump (xyz) is for our component, which we need to do.

If 5 happened with a major change, but everything, starting with version v1.2, was not there, we will incorrectly throw out the minor version, since checkin 5 was not in the assembly.

Does anyone have any suggestions on how this can be resolved?

Answer 1

I think it depends on how you “request changes.” But if you mean using git log v1.2..v1.3 , or something like that, then this should show you exactly what you want, i.e. enable commit 5.