... | ... | @@ -86,6 +86,35 @@ You never commit directly to HEAD. Rather, follow this workflow. |
|
|
|
|
|
In particular, **do not click the "Merge if passes tests" button**. That bypasses Marge and confuses her.
|
|
|
|
|
|
## Updating a sub-module, say nofib
|
|
|
|
|
|
Suppose want to update `nofib`, a submodule of `ghc`.
|
|
|
|
|
|
First, update the `nofib` repo itself:
|
|
|
```
|
|
|
$ git clone git@gitlab.haskell.org:ghc/nofib
|
|
|
$ cd nofib
|
|
|
$ git checkout -b wip/spj-fixes
|
|
|
<edit files, add commits on this wip/spj-fixes branch>
|
|
|
$ git push
|
|
|
<Go to GitLab and create an MR for wip/spj-fixes>
|
|
|
<Assign the MR to Marge>
|
|
|
<Wait for it to land in nofib master branch>
|
|
|
```
|
|
|
Now you are ready to make the `ghc` repo point to the new `nofib` repo commit. In a clean `ghc` tree (which has `nofib` as a subdirectory):
|
|
|
```
|
|
|
$ cd nofib
|
|
|
$ git checkout origin/master -- The latest commit, just landed above
|
|
|
$ git pull -- Make sure we actually have that commit locally
|
|
|
$ cd .. -- Back to main GHC treee
|
|
|
$ git checkout -b wip/spj-update-nofib
|
|
|
$ git add nofib -- Tells Git to make the current nofib into the submodule used by master
|
|
|
$ git commit -m "Update nofib in GHC master"
|
|
|
$ git push
|
|
|
<Go to GitLab and create a MR for wip/spj-update-nofib>
|
|
|
<Assign the MR to Marge>
|
|
|
```
|
|
|
|
|
|
# GitLab notes
|
|
|
|
|
|
## Issues
|
... | ... | |