| *** holser is now known as holser_ | 06:32 | |
| thomasb06 | gtema: Hello. There's only one commit to check, maybe I can send another bunch of docstring reformats? | 07:15 |
|---|---|---|
| gtema | sure, shoot it | 07:15 |
| opendevreview | Merged openstack/ansible-collections-openstack master: Add documentation links to README.md https://review.opendev.org/c/openstack/ansible-collections-openstack/+/814782 | 08:25 |
| thomasb06 | gtema: all the files of the first batch are in conflict. Would you know a command to fetch everything back from the server? | 08:29 |
| thomasb06 | done one by one, there were only 4 | 08:34 |
| gtema | ok | 08:34 |
| thomasb06 | the command `git review -v -y` returns the following error: https://x0.at/0QLb.txt | 08:54 |
| gtema | maybe as before you have empty commit or something similar? | 08:55 |
| frickler | thomasb06: gtema: "change https://review.opendev.org/c/openstack/openstacksdk/+/814370 closed" you are trying to push again a change that was already merged | 09:14 |
| frickler | likely need to rebase your stack on top of current master | 09:14 |
| gtema | ah, sure | 09:14 |
| frickler | or feature branch even | 09:14 |
| thomasb06 | frickler: wow, how do you do that? | 09:45 |
| thomasb06 | If run `git pull origin feature/r1`, it says "Already up to date." | 09:50 |
| frickler | thomasb06: I usually have the branches checked out locally, so I'd do "git checkout feature/r1;git pull;git checkout my-branch;git rebase feature/r1" | 09:53 |
| thomasb06 | let me try | 09:56 |
| thomasb06 | now there's a new message: https://x0.at/1fyC.txt | 10:05 |
| gtema | thomasb06 - you are having fun trying things nobody from us ever tried as I see :) | 10:08 |
| frickler | thomasb06: that means that you have either messed up the gerrit remote or your public key | 10:08 |
| frickler | thomasb06: you could try to remove the remote and recreate it with "git review -s" | 10:08 |
| gtema | try really doing those manually one by one. I guess the problem is that you rely on script to generate changes and under some conditions things are not going it is expected by platform | 10:09 |
| gtema | we should plan apply https://git.tsi-dev.otc-service.com/ecosystem/service_catalog/-/merge_requests/19 on Friday | 10:10 |
| thomasb06 | It seems ok now: https://x0.at/zrAx.txt ? No idea what I did wrong... | 10:10 |
| gtema | sorry, wrong room | 10:10 |
| *** holser_ is now known as holser | 10:12 | |
| thomasb06 | gtema: /we is reliefed | 10:13 |
| thomasb06 | * /m | 10:13 |
| opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815467 | 10:27 |
| thomasb06 | frickler: cheers | 10:27 |
| thomasb06 | gtema: do I keep going, or it gets a bit messy afterwards? | 10:27 |
| *** holser is now known as holser_ | 10:28 | |
| gtema | You can keep going. Just try to make not depending changes (each from/to current HEAD) and not stacked changes like last time | 10:29 |
| thomasb06 | so `git reset HEAD` after each commit? | 10:30 |
| gtema | Yeah | 10:48 |
| *** tosky_ is now known as tosky | 11:25 | |
| opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815476 | 12:00 |
| opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815477 | 12:02 |
| opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815478 | 12:03 |
| opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815480 | 12:05 |
| opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815481 | 12:06 |
| opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815482 | 12:07 |
| opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815483 | 12:08 |
| opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815484 | 12:09 |
| opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815485 | 12:11 |
| opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815486 | 12:12 |
| opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815487 | 12:13 |
| opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815488 | 12:14 |
| opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815489 | 12:15 |
| opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815490 | 12:16 |
| opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815491 | 12:17 |
| thomasb06 | This is it | 12:18 |
| *** holser_ is now known as holser | 12:26 | |
| frickler | thomasb06: wasn't that supposed to go to the feature branch? | 12:42 |
| thomasb06 | frickler: it's not feature/r1 ? | 12:43 |
| frickler | thomasb06: the above msgs all state master | 12:43 |
| thomasb06 | Arg... Usually, I'm on feature/r1. Maybe it's the rebase | 12:44 |
| thomasb06 | Anyway, it's just the doc. Maybe it can go the master straightaway? | 12:45 |
| frickler | gtema: ^^ I'm not sure what the thing with feature/r1 is exactly | 12:46 |
| thomasb06 | the command `git branch` says `* master`. No idea how I landed there... | 12:47 |
| gtema | well, it should go to feature/r1. It will be "soon" going to master, but we want those changes to happen in r1 branch. In gerrit Web UI you can "move change" | 12:47 |
| thomasb06 | let me try | 12:49 |
| thomasb06 | gtema: in `Move change to branch`, I write `feature/r1` only? | 12:50 |
| gtema | yes, should be like that | 12:50 |
| thomasb06 | The UI answers: `Could not perform action: move changes endpoint is disabled` | 12:51 |
| gtema | hmm, it worked for me before | 12:51 |
| thomasb06 | maybe origin/feature/r1 ? | 12:52 |
| gtema | maybe with gerrit update it was disabled | 12:52 |
| thomasb06 | Otherwise, I cancel them all and checkout the feature/r1 branch? | 12:53 |
| gtema | then - cherry-pick it into r1 branch. Otherwise - abandon and create new this time checking carefully | 12:54 |
| thomasb06 | let me check cherry-pick | 12:55 |
| opendevreview | SEUNG TAE KIM proposed openstack/python-openstackclient master: Add "image task list" command https://review.opendev.org/c/openstack/python-openstackclient/+/813554 | 12:59 |
| opendevreview | SEUNG TAE KIM proposed openstack/openstacksdk master: Add "limit" string in _query_mapping variable in task.py https://review.opendev.org/c/openstack/openstacksdk/+/814270 | 13:03 |
| *** Guest3656 is now known as redrobot | 13:03 | |
| opendevreview | SEUNG TAE KIM proposed openstack/python-openstackclient master: Add "image task list" command https://review.opendev.org/c/openstack/python-openstackclient/+/813554 | 13:07 |
| opendevreview | SEUNG TAE KIM proposed openstack/python-openstackclient master: Add "image task list" command https://review.opendev.org/c/openstack/python-openstackclient/+/813554 | 13:08 |
| thomasb06 | gtema: solution 3) with 115 votes seems ok: https://stackoverflow.com/questions/2941517/how-to-fix-committing-to-the-wrong-git-branch ? | 13:09 |
| gtema | do it in UI - chances to screw are much lower | 13:10 |
| thomasb06 | ah, there's a cherry-pick in UI. Let me check | 13:10 |
| thomasb06 | it says: `Cherry Pick failed! (merge conflicts). Please select "Continue" to continue with conflicts or select "cancel" to close the dialog.` | 13:12 |
| gtema | argh - then just start new. It is not worth of effort | 13:13 |
| thomasb06 | git branch says * (HEAD detached at origin/feature/r1) master | 13:19 |
| thomasb06 | it's ok? | 13:19 |
| gtema | hmm, why detached | 13:19 |
| thomasb06 | because when I commit some change, I always rewind | 13:20 |
| gtema | but you should rewind to feature/r1 and not land in detached state | 13:21 |
| thomasb06 | then I check the log | 13:22 |
| gtema | once you pushed one change `git reset --hard feature/r1 && git pull` | 13:22 |
| thomasb06 | git pull asks a distant and branch so `git pull origin feature/r1` ? | 13:23 |
| gtema | yes, maybe. I guess I set this in some settings for myself therefore it doesn't ask anymore | 13:25 |
| * gtema is afk for some hours | 13:26 | |
| thomasb06 | one to try: https://review.opendev.org/c/openstack/openstacksdk/+/815503 | 13:34 |
| opendevreview | Rodolfo Alonso proposed openstack/python-openstackclient master: Add --security-group to port list https://review.opendev.org/c/openstack/python-openstackclient/+/815506 | 13:51 |
| gtema | thomasb06, would you please also add service title in the commit message title | 13:59 |
| thomasb06 | sure | 14:00 |
| thomasb06 | so "Service title - Reindentation of the docstrings"? | 14:00 |
| *** sshnaidm_ is now known as sshnaidm | 14:03 | |
| thomasb06 | done | 14:04 |
| thomasb06 | in `def unmanage_volume`, there is an embedded docstring | 14:07 |
| thomasb06 | my bad, no worries | 14:07 |
| opendevreview | Diwei Zhu proposed openstack/python-openstackclient master: Switch server backup to sdk. https://review.opendev.org/c/openstack/python-openstackclient/+/814332 | 14:48 |
| opendevreview | Cyril Roelandt proposed openstack/python-openstackclient master: Fix typos https://review.opendev.org/c/openstack/python-openstackclient/+/815510 | 15:00 |
Generated by irclog2html.py 2.17.2 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!