This build failed. However it looks like the errors are unrelated to this PR

/cc @SimonCropp

@andreasohlund Thanks a lot for all those comments!

Below a new proposal.

Considering the following repo

               H1    H2     H3     H4   H5
          /----|-----|------|------|----|-----hotfix-1.0.1
         /
---|----|-------------------------------------master
   A    B

With the following decorations:

• A bears a tag "1.0.1-alpha1"
• H1 bears no tag
• H2 bears a "1.0.1-alpha2" tag
• H3 bears a "1.0.1-rc4" tag and a more recent "1.0.1-beta1" tag
• H4 bears a "1.0.2-alpha1" tag
• H5 bears a "andreas" tag

The process will search for a potential tag in the scope [B, H5]. The most recent tag matching the version of the branch will be used.

As such

• H5 tag will be ignored (not a version)
• H4 tag will be ignored (non matching version). Or should we throw here?
• Both H3 tag will be considered. The most recent one will be used (ie. the "beta1")
• H2 will not be tested as a valid tag as been found above
• B will not be tested as a valid tag as been found above
• A will never be be considered as it's a ancestor of the branching commit.

Moreover, regarding the branch naming convention, I propose the ensure the following policy

• A release or hotfix branch should never bear a stability/prerelease part

How does that sound?

All seems valid, go ahead!

Sent from my iPhone

On 7 dec 2013, at 17:07, nulltoken [email protected] wrote:

@andreasohlund Thanks a lot for all those comments!

Below a new proposal.

Considering the following repo

           H1    H2     H3     H4   H5
      /----|-----|------|------|----|-----hotfix-1.0.1
     /

---|----|-------------------------------------master
A B
With the following decorations:

A bears a tag "1.0.1-alpha1"
H1 bears no tag
H2 bears a "1.0.1-alpha2" tag
H3 bears a "1.0.1-rc4" tag and a more recent "1.0.1-beta1" tag
H4 bears a "1.0.2-alpha1" tag
H5 bears a "andreas" tag
The process will search for a potential tag in the scope [B, H5]. The most recent tag matching the version of the branch will be used.

As such

H5 tag will be ignored (not a version)
H4 tag will be ignored (non matching version). Or should we throw here?
Both H3 tag will be considered. The most recent one will be used (ie. the "beta1")
H2 will not be tested as a valid tag as been found above
B will not be tested as a valid tag as been found above
A will never be be considered as it's a ancestor of the branching commit.
Moreover, regarding the branch naming convention, I propose the ensure the following policy

A release or hotfix branch should never bear a stability/prerelease part
How does that sound?

—
Reply to this email directly or view it on GitHub.

@nulltoken fixed the tests

Fixed and rebased.