Differences

This shows you the differences between two versions of the page.

--- developers:git:specificities_git_abinit [2019/11/05 00:57] – [Additional info: Setup of the SSH environment] Matteo Giantomassi
+++ developers:git:specificities_git_abinit [2020/02/28 21:01] – [What is an "on-track" branch ?] Xavier Gonze
@@ Line 74: / Line 74: @@
 For a <color magenta>release-*</color> branch to be **on-track**, not only a specific commit must be contained in the past history of the branch, but also the commit that starts the next development version **cannot** be present. Only one among the <color magenta>release-*</color> branches is **on-track** at any time.
-As an example, suppose we were on ABINIT v8.9.x, and want to start preparing a release 8.10.0 (for production) and a new v8.11.0 (for development)   :
+As an example, suppose we were on ABINIT v9.0.0, and want to start preparing a release 9.0.1 (for release) and a new v9.1.0 (for development)   :
-  * a branch entitled <color magenta>release-8.10.0</color> will be forked from the <color magenta>develop</color> branch ;
+  * a branch entitled <color magenta>release-9.0</color> will be forked from the <color magenta>develop</color> branch ;
-  * after this branching, the first commit in the <color magenta>release-8.10.0</color> branch will be tagged start-8.10.0, while the first commit in the <color magenta>develop</color> branch will be tagged start-8.11.0,
+  * after this branching, the first commit in the <color magenta>release-9.0</color> branch will be tagged start-9.0, while the first commit in the <color magenta>develop</color> is the commit d51ce822
-  * for a <color magenta>develop</color> branch to be considered **on-track** (and eligible for a merge request), the commit tagged start-8.11.0 will have to be present ;
+  * for a <color magenta>develop</color> branch to be considered **on-track** (and eligible for a merge request), the commit d51ce822 must be present ;
-  * for a <color magenta>release-8.10.0</color> branch to be considered **on-track** (and eligible for a merge request), the commit tagged start-8.10.0 will have to be present, while it will be forbidden to contain the commit tagged start-8.11.0 .
+  * for a <color magenta>release-9.0</color> branch to be considered **on-track** (and eligible for a merge request), the commit tagged start-9.0 must be present, while it will be forbidden to contain the commit d51ce822 .
 In complement to the start of a X.Y.Z version being tagged as "start-X.Y.Z",