| Posted | Nick | Remark | |
|---|---|---|---|
| #openstack-sdks - 2021-10-26 | |||
| 08:34:42 | gtema | ok | |
| 08:54:54 | thomasb06 | the command `git review -v -y` returns the following error: https://x0.at/0QLb.txt | |
| 08:55:58 | gtema | maybe as before you have empty commit or something similar? | |
| 09:14:14 | 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:26 | frickler | likely need to rebase your stack on top of current master | |
| 09:14:53 | gtema | ah, sure | |
| 09:14:58 | frickler | or feature branch even | |
| 09:45:27 | thomasb06 | frickler: wow, how do you do that? | |
| 09:50:29 | thomasb06 | If run `git pull origin feature/r1`, it says "Already up to date." | |
| 09:53:40 | 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:56:21 | thomasb06 | let me try | |
| 10:05:32 | thomasb06 | now there's a new message: https://x0.at/1fyC.txt | |
| 10:08:02 | gtema | thomasb06 - you are having fun trying things nobody from us ever tried as I see :) | |
| 10:08:21 | frickler | thomasb06: that means that you have either messed up the gerrit remote or your public key | |
| 10:08:46 | frickler | thomasb06: you could try to remove the remote and recreate it with "git review -s" | |
| 10:09:01 | 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:10:04 | gtema | we should plan apply https://git.tsi-dev.otc-service.com/ecosystem/service_catalog/-/merge_requests/19 on Friday | |
| 10:10:14 | thomasb06 | It seems ok now: https://x0.at/zrAx.txt ? No idea what I did wrong... | |
| 10:10:26 | gtema | sorry, wrong room | |
| 10:13:28 | thomasb06 | gtema: /we is reliefed | |
| 10:13:39 | thomasb06 | * /m | |
| 10:27:00 | opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815467 | |
| 10:27:24 | thomasb06 | frickler: cheers | |
| 10:27:54 | thomasb06 | gtema: do I keep going, or it gets a bit messy afterwards? | |
| 10:29:11 | 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:30:23 | thomasb06 | so `git reset HEAD` after each commit? | |
| 10:48:36 | gtema | Yeah | |
| 12:00:45 | opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815476 | |
| 12:02:13 | opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815477 | |
| 12:03:57 | opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815478 | |
| 12:05:15 | opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815480 | |
| 12:06:17 | opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815481 | |
| 12:07:15 | opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815482 | |
| 12:08:07 | opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815483 | |
| 12:09:01 | opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815484 | |
| 12:11:36 | opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815485 | |
| 12:12:33 | opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815486 | |
| 12:13:54 | opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815487 | |
| 12:14:38 | opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815488 | |
| 12:15:45 | opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815489 | |
| 12:16:33 | opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815490 | |
| 12:17:35 | opendevreview | Thomas Bucaioni proposed openstack/openstacksdk master: Reindentation of the docstrings https://review.opendev.org/c/openstack/openstacksdk/+/815491 | |
| 12:18:27 | thomasb06 | This is it | |
| 12:42:41 | frickler | thomasb06: wasn't that supposed to go to the feature branch? | |
| 12:43:12 | thomasb06 | frickler: it's not feature/r1 ? | |
| 12:43:27 | frickler | thomasb06: the above msgs all state master | |
| 12:44:32 | thomasb06 | Arg... Usually, I'm on feature/r1. Maybe it's the rebase | |
| 12:45:01 | thomasb06 | Anyway, it's just the doc. Maybe it can go the master straightaway? | |
| 12:46:53 | frickler | gtema: ^^ I'm not sure what the thing with feature/r1 is exactly | |
| 12:47:53 | thomasb06 | the command `git branch` says `* master`. No idea how I landed there... | |
| 12:47:57 | 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:49:14 | thomasb06 | let me try | |
| 12:50:32 | thomasb06 | gtema: in `Move change to branch`, I write `feature/r1` only? | |
| 12:50:47 | gtema | yes, should be like that | |
| 12:51:33 | thomasb06 | The UI answers: `Could not perform action: move changes endpoint is disabled` | |
| 12:51:47 | gtema | hmm, it worked for me before | |
| 12:52:18 | thomasb06 | maybe origin/feature/r1 ? | |
| 12:52:27 | gtema | maybe with gerrit update it was disabled | |
| 12:53:46 | thomasb06 | Otherwise, I cancel them all and checkout the feature/r1 branch? | |
| 12:54:39 | gtema | then - cherry-pick it into r1 branch. Otherwise - abandon and create new this time checking carefully | |
| 12:55:20 | thomasb06 | let me check cherry-pick | |
| 12:59:27 | opendevreview | SEUNG TAE KIM proposed openstack/python-openstackclient master: Add "image task list" command https://review.opendev.org/c/openstack/python-openstackclient/+/813554 | |
| 13:03:11 | 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:07: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:43 | opendevreview | SEUNG TAE KIM proposed openstack/python-openstackclient master: Add "image task list" command https://review.opendev.org/c/openstack/python-openstackclient/+/813554 | |
| 13:09:32 | thomasb06 | gtema: solution 3) with 115 votes seems ok: https://stackoverflow.com/questions/2941517/how-to-fix-committing-to-the-wrong-git-branch ? | |
| 13:10:18 | gtema | do it in UI - chances to screw are much lower | |
| 13:10:47 | thomasb06 | ah, there's a cherry-pick in UI. Let me check | |
| 13:12:33 | thomasb06 | it says: `Cherry Pick failed! (merge conflicts). Please select "Continue" to continue with conflicts or select "cancel" to close the dialog.` | |
| 13:13:55 | gtema | argh - then just start new. It is not worth of effort | |
| 13:19:01 | thomasb06 | git branch says * (HEAD detached at origin/feature/r1) master | |
| 13:19:04 | thomasb06 | it's ok? | |
| 13:19:49 | gtema | hmm, why detached | |
| 13:20:25 | thomasb06 | because when I commit some change, I always rewind | |
| 13:21:35 | gtema | but you should rewind to feature/r1 and not land in detached state | |
| 13:22:11 | thomasb06 | then I check the log | |
| 13:22:22 | gtema | once you pushed one change `git reset --hard feature/r1 && git pull` | |
| 13:23:34 | thomasb06 | git pull asks a distant and branch so `git pull origin feature/r1` ? | |
| 13:25:53 | gtema | yes, maybe. I guess I set this in some settings for myself therefore it doesn't ask anymore | |
| 13:34:29 | thomasb06 | one to try: https://review.opendev.org/c/openstack/openstacksdk/+/815503 | |
| 13:51:00 | opendevreview | Rodolfo Alonso proposed openstack/python-openstackclient master: Add --security-group to port list https://review.opendev.org/c/openstack/python-openstackclient/+/815506 | |
| 13:59:49 | gtema | thomasb06, would you please also add service title in the commit message title | |
| 14:00:11 | thomasb06 | sure | |
| 14:00:36 | thomasb06 | so "Service title - Reindentation of the docstrings"? | |
| 14:04:35 | thomasb06 | done | |
| 14:07:28 | thomasb06 | in `def unmanage_volume`, there is an embedded docstring | |
| 14:07:44 | thomasb06 | my bad, no worries | |
| 14:48:23 | opendevreview | Diwei Zhu proposed openstack/python-openstackclient master: Switch server backup to sdk. https://review.opendev.org/c/openstack/python-openstackclient/+/814332 | |
| 15:00:46 | opendevreview | Cyril Roelandt proposed openstack/python-openstackclient master: Fix typos https://review.opendev.org/c/openstack/python-openstackclient/+/815510 | |
| #openstack-sdks - 2021-10-27 | |||
| 06:49:25 | thomasb06 | gtema: Hello. Is the commit message what you were expecting: https://review.opendev.org/c/openstack/openstacksdk/+/815503/1 ? | |
| 06:56:50 | gtema | In principle yes, but instead of "service title" there should be "block storage" | |
| 06:57:12 | gtema | And can you please do all versions of same service in single change | |
| 07:13:48 | thomasb06 | Sure, I correct this one with a commit --append | |
| 07:15:01 | thomasb06 | done | |
| 07:16:08 | thomasb06 | ah, there's a v3 for the block storage service... | |
| 07:16:56 | thomasb06 | I add the v3 to the commit now | |
| 07:48:54 | thomasb06 | gtema: at the moment, I'm trying to amend the file block_storage/v3/_proxy.py in the commit 815503, but it never shows in the UI. The procedure is to type `git commit --amend`, then `git add _proxy.py`, and finally `git review -y`? | |
| 07:55:22 | thomasb06 | when I type `git show 894b5450469de600c4a7c7c313c9766de6765fb6`, it looks ok... Let me know if the v3 is missing for you | |
| 07:55:50 | thomasb06 | (by the way, are my commit hash the same as for Gerrit?) | |
| 09:11:29 | opendevreview | Stephen Finucane proposed openstack/python-openstackclient master: Switch server backup to sdk. https://review.opendev.org/c/openstack/python-openstackclient/+/814332 | |