developers:git:specificities_git_abinit
Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revisionNext revisionBoth sides next revision | ||
developers:git:specificities_git_abinit [2018/11/05 18:18] – [git(lab) : ABINIT specifics] Xavier Gonze | developers:git:specificities_git_abinit [2024/02/29 10:06] – [How to set up a "hotfix" branch to be merged in trunk/release-x.y ?] Xavier Gonze | ||
---|---|---|---|
Line 10: | Line 10: | ||
On the ABINIT gitlab server, an ABINIT project can be defined, specifically for you, with address <color blue> | On the ABINIT gitlab server, an ABINIT project can be defined, specifically for you, with address <color blue> | ||
- | In order to start to work locally (not on the ABINIT gitlab server, but on your own machine), you should setup the SSH environment for gitlab, as described | + | In order to start to work locally (not on the ABINIT gitlab server, but on your own machine), you should setup the SSH environment for gitlab, as described |
You have by default a <color magenta> | You have by default a <color magenta> | ||
Line 74: | Line 74: | ||
For a <color magenta> | For a <color magenta> | ||
- | As an example, suppose we were on ABINIT | + | As an example, suppose we were on ABINIT |
- | * a branch entitled <color magenta> | + | * a branch entitled <color magenta> |
- | * after this branching, the first commit in the <color magenta> | + | * after this branching, |
- | * for a <color magenta> | + | * for a <color magenta> |
- | * for a <color magenta> | + | * for a <color magenta> |
- | In complement to the start of a X.Y.Z version being tagged as " | + | In complement to the start of a X.Y.Z version |
- | the commit that ends some X.Y.Z version | + | the commit that ends some X.Y.Z version |
Line 95: | Line 95: | ||
The default selection of bots, that is the " | The default selection of bots, that is the " | ||
The selection capabilities of the Buildbot Status table are rather extended, you have to play a bit wit them. | The selection capabilities of the Buildbot Status table are rather extended, you have to play a bit wit them. | ||
- | |||
- | (By the way, the behaviour of this Buildbot Status table when changing the selections has still some problems -as of May 2018-. Do not hesitate to click on the update button, and the " | ||
===== How and when will the merge in the master branch be done ? ===== | ===== How and when will the merge in the master branch be done ? ===== | ||
Line 105: | Line 103: | ||
However, when a <color magenta> | However, when a <color magenta> | ||
+ | |||
The master branch is only used by the trunk. So, never issue a merge request to trunk/ | The master branch is only used by the trunk. So, never issue a merge request to trunk/ | ||
Line 118: | Line 117: | ||
Then, in order to synchronize, | Then, in order to synchronize, | ||
- | git fetch trunk | + | git fetch --tags |
then, if the develop branch is to be updated, supposing it is checked out, merge the trunk/ | then, if the develop branch is to be updated, supposing it is checked out, merge the trunk/ | ||
Line 128: | Line 127: | ||
git pull trunk develop | git pull trunk develop | ||
- | If, on the contrary, | + | ===== How to set up a " |
- | | + | If you have a hotfix, a new branch |
- | git checkout release-8.8 | + | |
- | git merge remotes/ | + | |
- | git push -u origin release-8.8 | + | |
- | That's it ! You can now make modifications in your release-8.8, then issue a merge request to the trunk/ | + | git branch release-9.8 start-9.8.0 |
+ | git checkout release-9.8 | ||
+ | git merge remotes/ | ||
+ | git push -u origin release-9.8 --tags | ||
+ | |||
+ | That's it ! You can now make modifications in your release-9.8, then issue a merge request to the trunk/ | ||
===== Additional info: how to not mess with your branches ? ... show-branch ... ===== | ===== Additional info: how to not mess with your branches ? ... show-branch ... ===== | ||
Line 179: | Line 180: | ||
| | ||
+ | |||
and then, copy the public key // | and then, copy the public key // | ||
Line 195: | Line 197: | ||
ssh add ~/ | ssh add ~/ | ||
+ | For further details, please consult the official documentation < |
developers/git/specificities_git_abinit.txt · Last modified: 2024/04/09 16:58 by Xavier Gonze