| irc.libera.chat #tryton log beginning Fri Jan 27 12:10:01 AM CET 2023 | ||
| -!- cedk(~ced@gentoo/developer/cedk) has joined #tryton | 00:19 | |
| -!- ChanServ changed mode/#tryton -> +o cedk | 00:19 | |
| -!- mrichez(~Maxime@2a02:a03f:c2e8:f900:db7c:11fb:1fc6:3112) has joined #tryton | 05:30 | |
| -!- springwurm(~springwur@5.104.149.54) has joined #tryton | 06:12 | |
| -!- xt0ph(~xt0ph@82-64-116-172.subs.proxad.net) has joined #tryton | 06:42 | |
| xt0ph | I follow the heptapod guide to create MR, is there a way to link them to an issue ? | 07:20 |
|---|---|---|
| pokoli | xt0ph: just include #Closes issuenum on the commit message or MR description | 07:30 |
| -!- tbruyere(~Thunderbi@mail.saluc.com) has joined #tryton | 07:44 | |
| xt0ph | @pokoli: to put the issuenum in MR description i need to go in web UI ? | 07:59 |
| pokoli | xt0ph: if you put it in the commit description (as a separate line) it will be done automatically | 07:59 |
| pokoli | xt0ph: otherwise yes you need to do it on the web UI | 07:59 |
| -!- rpit(~rpit@p200300c88f10b000c806f2a8949efcf2.dip0.t-ipconnect.de) has joined #tryton | 08:00 | |
| -!- rpit(~rpit@p200300c88f10b000c806f2a8949efcf2.dip0.t-ipconnect.de) has joined #tryton | 08:11 | |
| xt0ph | @pokoli: I don't think I have the right to create an MR, how do I request it? my user Heptapod Christophe @xt0ph | 08:22 |
| pokoli | xt0ph: you need to request developer access to the tryton group | 08:23 |
| xt0ph | @pokoli: Ok, where can i do that by email? a link ? | 08:27 |
| pokoli | xt0ph: https://www.tryton.org/develop | 08:30 |
| pokoli | xt0ph: make sure to read everything carefully | 08:31 |
| xt0ph | @pokoli: thank you, but I had already pushed some modification before Heptapod. | 08:36 |
| pokoli | xt0ph: the page is updated to explain all heptapod steps | 08:37 |
| xt0ph | @pokoli: I just missed a little link :-) | 08:39 |
| xt0ph | ?debug=1 | 08:48 |
| pokoli | xt0ph: I accepted you ;-) | 08:49 |
| -!- nicoe(~nicoe@2a02:578:852a:c00:18c2:1aff:fef9:2b7f) has joined #tryton | 08:49 | |
| -!- cedk(~ced@gentoo/developer/cedk) has joined #tryton | 08:53 | |
| -!- ChanServ changed mode/#tryton -> +o cedk | 08:53 | |
| pokoli | cedk: it will be great if you can explain how you fixed https://foss.heptapod.net/tryton/tryton/-/merge_requests/234 | 09:17 |
| pokoli | Otherwise next time I won't be able to do it by myself | 09:17 |
| pokoli | cedk: and about https://foss.heptapod.net/tryton/tryton/-/merge_requests/224#note_282063 I do not understand which should be the correct workflow | 09:19 |
| pokoli | cedk: when should I create a MR without issue? Why you are splitting it in two commits? | 09:19 |
| xt0ph | @pokoli: I saw that :-) thank, i check all my work and i create a MR | 09:38 |
| pokoli | xt0ph: I gave you the wrong indicatio. It is closes #num instead of #closes num sorry | 09:44 |
| pokoli | xt0ph: I updated the MR to show how it should look like. It will be great if you update the commit message | 09:46 |
| pokoli | xt0ph: do you know how to update the commit message? | 09:47 |
| xt0ph | @pokoli: before pushed yes, but after ? | 09:48 |
| pokoli | xt0ph: you should use the histedit extension: https://www.mercurial-scm.org/wiki/HisteditExtension | 09:49 |
| pokoli | xt0ph: you should use the mess option to edit without changin commit content. | 09:49 |
| pokoli | Once done you can push the new commit and everything will work as expected | 09:49 |
| xt0ph | @pokoli: ok, i try that :-) | 09:50 |
| cedk | pokoli: `hg rebase` | 09:56 |
| cedk | for small fix, I do not think we need to create an issue if we already have the patch | 09:57 |
| pokoli | cedk: ok about MR without fix, but still not understand when to use multiple commits or multiple MR | 10:00 |
| cedk | I do not think there are rules | 10:01 |
| cedk | in a MR there should be thing about the same topic | 10:01 |
| pokoli | but which is the benefit of having two changesets instead of one? | 10:02 |
| cedk | pokoli: atomic change | 10:03 |
| nicoe | xt0ph: you can also edit the commit message of the last commit by simply doing `hg commit --amend`, beware that it will also commit your local changes | 10:11 |
| nicoe | xt0ph: the histedit extension is essentially the equivalent of `git rebase --interactive`, I would use it only when I need to work on multiple commits in the same process | 10:12 |
| nicoe | xt0ph: but you course you should do as you are the more comfortable | 10:13 |
| xt0ph | @nicoe: Thanks for the info, I'll take note of it :-) | 10:14 |
| xt0ph | @pokoli: I modified my commit message as requested, I have to do something else on the MR? | 10:15 |
| nicoe | (and I think we should also stress the importance of using a good .hgrc in order not to mess with other people work ; maybe in the README.rst?) | 10:16 |
| nicoe | (or the CONTRIBUTING file that gitlab wants us to create :D) | 10:16 |
| pokoli | xt0ph: everything looks nice now. Its a good idea to assign a reviewer to your MR so it will be reviewed | 10:18 |
| pokoli | nicoe: I think contributing is a good idea | 10:18 |
| nicoe | pokoli: it would require an overhaul of the README too then because currently the README looks more like a CONTRIBUTING file than a README (and we need a README as it's the first thing people will see on heptapod) | 10:20 |
| pokoli | nicoe: AFAIR contribution is shown somewhere in gitlab, right? | 10:23 |
| nicoe | pokoli: I guess it's shown somewhere but I don't know where | 10:29 |
| nicoe | But it will be too late anyway :) (as the user will see the merge request page after he pushed commits that broke everything) | 10:31 |
| nicoe | But on the other hand people usually starts with creating an issue and I guess they will see it there too | 10:31 |
| nicoe | pokoli: https://foss.heptapod.net/heptapod/heptapod/-/issues/new | 10:32 |
| nicoe | on the bottom there is the line "Please review the contribution guidelines for this project." | 10:33 |
| nicoe | that links to the CONTRIBUTING file | 10:33 |
| pokoli | nicoe: at least that should point to our develop page | 10:37 |
| nicoe | indeed | 10:55 |
| pokoli | cedk: continuing our discussion from yesterday: I created https://foss.heptapod.net/tryton/tryton/-/merge_requests/237 for my own interest as I'm the one who have the problem | 10:57 |
| pokoli | but for me this is still mantaining the code, as my change will be available for everyone | 10:57 |
| -!- nicoe(~nicoe@2a02:578:852a:c00:18c2:1aff:fef9:2b7f) has joined #tryton | 11:55 | |
| -!- springwurm(~springwur@5.104.149.54) has joined #tryton | 13:06 | |
| -!- tbruyere(~Thunderbi@mail.saluc.com) has joined #tryton | 14:52 | |
| -!- xt0ph(~xt0ph@82-64-116-172.subs.proxad.net) has joined #tryton | 15:37 | |
| -!- nicoe(~nicoe@2a02:578:852a:c00:18c2:1aff:fef9:2b7f) has joined #tryton | 16:47 | |
| -!- cedk(~ced@gentoo/developer/cedk) has joined #tryton | 20:57 | |
| -!- ChanServ changed mode/#tryton -> +o cedk | 20:57 | |
| -!- nicoe(~nicoe@2a02:578:852a:c00:18c2:1aff:fef9:2b7f) has joined #tryton | 22:23 | |
Generated by irclog2html.py 2.17.3 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!