Thanks to other answerers we finally agreed on the versioning system.

The idea is to start test version with release number (e.g. 1.1.0.1 means "test version for 1.1.0 release") and remove Test when testing is finished.

Typically version is growing up

1.1.1 --- 1.1.0.1 --- 1.1.0.2 --- 1.1.0.3 --- ... --- 1.2

And we will start differently and do reset at the end

1.1.1 --- 1.2.0.1 --- 1.2.0.2 --- 1.2.0.3 --- ... --- 1.2

The image:

• The release branch version will continue from the version of the trunk.
• The trunk version will be reset to x.x.0.1.
• After release the test version is reset to x.x.x.1, where x.x.x is next release version
• Release versions are obtained by clearing Test number (means "test if finished").

Thanks to other answerers we finally agreed on the versioning system.

The idea is to start test version with release number (e.g. 1.1.0.1 means "test version for 1.1.0 release") and remove Test when testing is finished.

Typically version is growing up

1.1.1 --- 1.1.0.1 --- 1.1.0.2 --- 1.1.0.3 --- ... --- 1.2

And we will start differently and do reset at the end

1.1.1 --- 1.2.0.1 --- 1.2.0.2 --- 1.2.0.3 --- ... --- 1.2

The image:

• The release branch version will continue from the version of the trunk.
• The trunk version will be reset to x.x.0.1.
• After release the test version is reset to x.x.x.1, where x.x.x is next release version.
• Release versions are obtained by clearing Test number (means "test is finished").