| *** bananadev has joined #cip | 07:06 | |
| *** rajm has joined #cip | 08:12 | |
| *** toscalix has joined #cip | 08:57 | |
| toscalix | rajm: there are two merge requests in gitlab pending: https://gitlab.com/cip-project/testing/merge_requests | 10:06 |
|---|---|---|
| toscalix | what is their status? | 10:06 |
| toscalix | it seems there are conflicts for one of them and the other is delayed | 10:06 |
| rajm | Wanted to postpone the delayed one as it mentions the webserver externally which we haven't yet got working | 10:09 |
| toscalix | hummm... let me think a little what to do with these cases | 10:10 |
| *** bananadev has quit IRC | 10:10 | |
| rajm | The conflict is because of a merge on friday that leapfrogged this one I'm intending to drop it and resubmit | 10:10 |
| toscalix | I think that the second one, with the conflict, requires that you guys act on it | 10:13 |
| toscalix | either close it or assign a task to somebody to resolve the conflict | 10:13 |
| toscalix | click on the commit and there is a menu on the right for it | 10:14 |
| toscalix | it would require also an assignee | 10:14 |
| toscalix | it cannot be in a "limbo" | 10:14 |
| toscalix | and it cannot be approved | 10:15 |
| toscalix | if it is a WIP merge, edit is and you find the help on how to deal with it (adding WIP in front of the title) | 10:16 |
| toscalix | In summary, donbrown and you will have to invest time in learning about gitlab | 10:17 |
| toscalix | the repo details | 10:17 |
| toscalix | Repository section | 10:17 |
| toscalix | some of the actions from the command line has specific ways of being managed in the user interface | 10:17 |
| rajm | ok, I'll close it and then the change can be done cleanly | 10:21 |
| *** bananadev has joined #cip | 10:22 | |
| toscalix | Yopshi added all the stable kernels to the linux-cip project | 10:32 |
| toscalix | Yoshi | 10:32 |
| toscalix | now it is very herd to manage any activity on the cip-kernel | 10:32 |
| toscalix | I asked him why he did that and suggested to have the stable kernels in a different project, if they are needed for anything | 10:32 |
| rajm | merge now closed and a new one opened https://gitlab.com/cip-project/testing/merge_requests/6 | 10:36 |
| *** brlogger has joined #cip | 10:49 | |
| *** brlogger has joined #cip | 11:17 | |
| *** brlogger has joined #cip | 11:20 | |
| toscalix | rajm: thanks | 11:24 |
| *** bananadev has quit IRC | 11:27 | |
| toscalix | Ah, Yoshi answered me that he was trying to fix the issue with mirroring bwh CIP kernel repo | 12:13 |
| toscalix | same issue I had on Thu/Fri | 12:13 |
| toscalix | and by mistake he mirrored many kernel repos | 12:13 |
| toscalix | so topic clarified | 12:13 |
| *** brlogger has joined #cip | 13:58 | |
| *** toscalix has quit IRC | 14:05 | |
| *** toscalix has joined #cip | 14:14 | |
| toscalix | rajm created the initial milestone: https://gitlab.com/cip-project/testing/milestones/1 | 14:41 |
| toscalix | please refer to it in your commits | 14:41 |
| toscalix | I already added in the current ones | 14:42 |
| toscalix | so for the future | 14:42 |
| rajm | ok! | 14:43 |
| *** rajm has quit IRC | 16:50 | |
| *** toscalix has quit IRC | 17:47 | |
Generated by irclog2html.py 2.15.3 by Marius Gedminas - find it at mg.pov.lt!