... | ... | @@ -16,35 +16,43 @@ If converting existing trac or github repository: |
|
|
```
|
|
|
git remote rename origin trac
|
|
|
git remote add origin git@gitlab.isc.org:isc-projects/kea.git
|
|
|
git fetch origin
|
|
|
git ... // set the local origin to track remote origin on gitlab
|
|
|
git branch -u origin/master master
|
|
|
git pull
|
|
|
```
|
|
|
|
|
|
- get your usual repo ready
|
|
|
If you set up a new repository:
|
|
|
```
|
|
|
git checkout master
|
|
|
git clean -fxd
|
|
|
git pull
|
|
|
git clone git@gitlab.isc.org:isc-projects/kea.git
|
|
|
cd kea
|
|
|
git remote add trac ssh://username@git.kea.isc.org/git/kea
|
|
|
git fetch trac
|
|
|
```
|
|
|
|
|
|
- Add gitlab as an additional repository:
|
|
|
Now you can do:
|
|
|
|
|
|
```
|
|
|
git remote add gitlab git@gitlab.isc.org:isc-projects/kea.git
|
|
|
# This will pull the current branch you're on from gitlab
|
|
|
git pull
|
|
|
|
|
|
# This will pull whatever you still need to salvage from trac repo
|
|
|
git fetch trac
|
|
|
```
|
|
|
|
|
|
- ```git fetch gitlab```
|
|
|
When migrating stuff between repos, DO NOT copy files over. Use cherry-pick instead.
|
|
|
|
|
|
# Working on an issue
|
|
|
# Adding an issue
|
|
|
|
|
|
- pick a ticket in trac that you want to copy. Mark it somehow in trac that it's being handled in gitlab.
|
|
|
- If the issue is not in gitlab yet, pick a ticket in trac that you want to copy. Copy the description manually to gitlab (go to https://gitlab.isc.org/tomek/kea, click on issues on the left, then "New Issue"). Close the ticket in trac with a link to gitlab issue.
|
|
|
|
|
|
- create issue in gitlab: go to https://gitlab.isc.org/tomek/kea, click on issues on the left, then "New Issue". Make sure it's assigned to kea1.5 milestone. Assign labels as necessary. Add labels if they're missing.
|
|
|
- If you have something new to work on, create an issue in gitlab: go to https://gitlab.isc.org/tomek/kea, Make sure it's assigned to kea1.5 milestone. Assign labels as necessary. Add labels if they're missing. We'll decide on the best way to substitute kea-proposed mechanism.
|
|
|
|
|
|
# Working on an issue
|
|
|
|
|
|
- Assign the issue to yourself. Also go to https://gitlab.isc.org/tomek/kea/boards and move it to appropriate stage. Add label "doing".
|
|
|
- Assign the issue to yourself. You should also assign Doing label. There are two ways of doing that. First, you can add the label manually when browsing an issue. Alternatively, you can go to https://gitlab.isc.org/isc-projects/kea/boards and move your issue to appropriate stage.
|
|
|
|
|
|
- Open the issue page, e.g. https://gitlab.isc.org/tomek/kea/issues/3 and click create merge request. a branch will be created for you.
|
|
|
- Open the issue page, e.g. https://gitlab.isc.org/isc-projects/kea/issues/3 and click create merge request. a branch will be created for you.
|
|
|
|
|
|
- git pull gitlab. Note the branch that was created will be there. Check it out and start working on the code.
|
|
|
- ```git pull```. Note the branch that was created will be there. Check it out and start working on the code. If you dislike the branch name being too long, consider using shorter description for the issue. However, it must still be human readable and people need to have a chance to understand what the issue is about.
|
|
|
|
|
|
- Commit your changes, push it on that branch.
|
|
|
|
... | ... | @@ -58,7 +66,7 @@ git remote add gitlab git@gitlab.isc.org:isc-projects/kea.git |
|
|
|
|
|
# Merging code
|
|
|
|
|
|
- Kea project is currently set up in a way that allows only fast-forward merges. This is not the only possible option, it's just something to try out. If you don't like it, it doesn't mean that the whole gitlab is bad. We can adjust as needed.
|
|
|
- Kea project is currently set up in a way that allows only fast-forward merges. This is not the only possible option, it's just something Tomek feels is the right way to go. It keeps the repo history much cleaner. If you complain about tons of merge conflicts, you tried to push a ticket that was too big.
|
|
|
|
|
|
- Currently we don't have any CI integrated with gitlab. Before merging, please run unit-tests as we did in the trac days.
|
|
|
|
... | ... | |