developers:git:specificities_git_abinit
Differences
This shows you the differences between two versions of the page.
| Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
| developers:git:specificities_git_abinit [2019/11/04 23:57] – [Additional info: Setup of the SSH environment] Matteo Giantomassi | developers:git:specificities_git_abinit [2024/09/02 14:20] (current) – Maryam Azizi | ||
|---|---|---|---|
| Line 1: | Line 1: | ||
| + | <WRAP important> | ||
| + | |||
| ====== git(lab) : ABINIT specificities ====== | ====== git(lab) : ABINIT specificities ====== | ||
| Line 10: | Line 12: | ||
| 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 30: | Line 32: | ||
| \\ | \\ | ||
| After some modifications, | After some modifications, | ||
| - | <color blue>git push </ | ||
| - | [ or\\ | ||
| <color blue>git push --tags | <color blue>git push --tags | ||
| - | if tags have been introduced...]\\ | + | \\ |
| In order for the modifications to be merged in the trunk, a merge request has to be issued, as described later.\\ | In order for the modifications to be merged in the trunk, a merge request has to be issued, as described later.\\ | ||
| \\ | \\ | ||
| 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 124: | Line 123: | ||
| git merge remotes/ | git merge remotes/ | ||
| - | You can combine the last two commands in one as: | ||
| - | git pull trunk develop | + | ===== How to set up a " |
| - | If, on the contrary, a new branch | + | If you have a hotfix, a new branch |
| - | git branch release-8.8 start-8.8.1 (this creates the branch release-8.8 from the start-8.8.1 tag) | + | git branch release-9.8 start-9.8.0 (this creates the branch release-9.8 from the start-9.8.0 tag) |
| - | git checkout release-8.8 | + | git checkout release-9.8 |
| - | git merge remotes/ | + | git merge remotes/ |
| - | git push -u origin release-8.8 | + | git push -u origin release-9.8 --tags |
| - | That's it ! You can now make modifications in your release-8.8, then issue a merge request to the trunk/ | + | 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 177: | ||
| | | ||
| - | + | ||
| - | For further details, please consult the official documentation < | + | |
| - | + | ||
| and then, copy the public key // | and then, copy the public key // | ||
| Line 198: | Line 194: | ||
| ssh add ~/ | ssh add ~/ | ||
| + | For further details, please consult the official documentation < | ||
developers/git/specificities_git_abinit.1572911840.txt.gz · Last modified: 2019/11/04 23:57 by Matteo Giantomassi