*** markvoelker has quit IRC | 00:02 | |
*** brinzhang has joined #openstack-glance | 00:15 | |
*** markvoelker has joined #openstack-glance | 00:58 | |
*** imacdonn has quit IRC | 01:22 | |
*** imacdonn has joined #openstack-glance | 01:22 | |
*** markvoelker has quit IRC | 01:32 | |
*** pooja_jadhav has quit IRC | 01:45 | |
*** MattMan_ has quit IRC | 01:46 | |
*** MattMan_ has joined #openstack-glance | 01:46 | |
*** pooja_jadhav has joined #openstack-glance | 01:53 | |
*** jmccrory has joined #openstack-glance | 02:02 | |
*** Dinesh_Bhor has joined #openstack-glance | 02:07 | |
*** Dinesh_Bhor has quit IRC | 02:31 | |
*** Dinesh_Bhor has joined #openstack-glance | 02:35 | |
*** lixiaoy1 has joined #openstack-glance | 02:48 | |
*** Dinesh_Bhor has quit IRC | 04:08 | |
*** Dinesh_Bhor has joined #openstack-glance | 05:17 | |
*** Luzi has joined #openstack-glance | 05:45 | |
*** pcaruana has joined #openstack-glance | 06:14 | |
*** mosulica has joined #openstack-glance | 06:29 | |
*** Dinesh_Bhor has quit IRC | 06:36 | |
*** pcaruana has quit IRC | 07:09 | |
*** rcernin has quit IRC | 07:17 | |
*** Dinesh_Bhor has joined #openstack-glance | 07:26 | |
*** pcaruana has joined #openstack-glance | 07:28 | |
*** pcaruana is now known as pcaruana|elisa| | 07:30 | |
*** Dinesh_Bhor has quit IRC | 08:02 | |
*** mosulica has quit IRC | 08:36 | |
*** lixiaoy1 has quit IRC | 08:54 | |
*** Dinesh_Bhor has joined #openstack-glance | 09:06 | |
*** zigo has joined #openstack-glance | 09:13 | |
*** brinzhang has quit IRC | 09:53 | |
*** Dinesh_Bhor has quit IRC | 10:22 | |
*** jdillaman1 has joined #openstack-glance | 11:57 | |
*** dillaman has quit IRC | 11:59 | |
*** jiaopengju has quit IRC | 12:16 | |
*** jiaopengju has joined #openstack-glance | 12:16 | |
*** rosmaita has joined #openstack-glance | 12:30 | |
*** dpawlik has quit IRC | 12:30 | |
*** dpawlik has joined #openstack-glance | 12:30 | |
*** priteau has joined #openstack-glance | 12:34 | |
*** dpawlik has quit IRC | 12:35 | |
*** jmlowe has joined #openstack-glance | 13:17 | |
*** lbragstad is now known as elbragstad | 13:23 | |
*** dpawlik has joined #openstack-glance | 13:37 | |
*** dpawlik has quit IRC | 13:38 | |
*** dpawlik has joined #openstack-glance | 13:38 | |
*** Luzi has quit IRC | 14:07 | |
*** mhen has joined #openstack-glance | 14:27 | |
*** jistr is now known as jistr|call | 14:29 | |
mhen | rosmaita, are you around? | 14:29 |
---|---|---|
rosmaita | mhen: hello | 14:35 |
mhen | rosmaita, hi :) | 14:35 |
mhen | rosmaita, sorry for interrupting you. Just a quick question about specs in gerrit | 14:36 |
rosmaita | np, i need to review your spec today | 14:36 |
rosmaita | :) | 14:36 |
rosmaita | what's your question? | 14:36 |
mhen | I'd like to address your comments so far by adding a few updates to the spec | 14:36 |
mhen | on the comments there are buttons like "Reply", "Fix", "Done" etc. - do I have to use this functionality or can I simply push a new revision via "git review" from a local working copy? | 14:37 |
mhen | what happens to old comments and their binding to lines and parts of the code/spec when a new revision is uploaded? | 14:38 |
rosmaita | the comments are bound to a particular patch set -- so the new revision won't have links to them. but someone can see them by changing the patch sets being compared in the gerrit interface | 14:39 |
rosmaita | usually, i use "reply" when i want to respond, but it's not something i will address in the next patch set | 14:39 |
rosmaita | "done" is kind of nice because it indicates that you've accepted the comment and have done something about it in your new patch set | 14:39 |
mhen | so I upload a new patch set and then click "Done" on the relevant discussion points from the previous one? | 14:40 |
rosmaita | if you want to ... it's kind of helpful to make sure you addressed them | 14:40 |
rosmaita | if there are a lot of comments, you can get sidetracked when you do your changes and forget to address some | 14:41 |
rosmaita | (which can really annoy reviewers, to read through and see that you've ignored their comments!) | 14:41 |
rosmaita | glad to hear that you're pushing a new patch set, i'll wait to comment on the new patch | 14:43 |
mhen | it's not that big of a change, just clarifying/updating a few things | 14:43 |
mhen | thanks for your advice, I'll try my best | 14:43 |
rosmaita | mhen: happy to help, glad you are keeping things moving | 14:45 |
*** jistr|call is now known as jistr | 14:47 | |
*** pcaruana|elisa| has quit IRC | 14:56 | |
*** pcaruana|elisa| has joined #openstack-glance | 14:57 | |
*** pcaruana|elisa| has quit IRC | 15:08 | |
*** pcaruana has joined #openstack-glance | 15:08 | |
mhen | rosmaita, I used the "Checkout" link at the top right "Download" menu in gerrit, made my changes, committed and now wanted to push via "git review". It is now asking me if I really want to submit 2 commits since it seems to include the original patch set's commit. How do I do this correctly? | 15:11 |
rosmaita | mhen: looking | 15:12 |
rosmaita | when you committed, did you do "git commit --amend" ? | 15:13 |
mhen | rosmaita, no I didn't | 15:14 |
rosmaita | yeah, that's the trick to using gerrit, you keep amending the commit at the head of your local branch, and gerrit keeps track of hte patch sets for you | 15:16 |
mhen | rosmaita, I see | 15:16 |
mhen | I just noticed Luzi already noted that down but I somehow missed it :) | 15:17 |
rosmaita | i'm trying to think of an easy way to do this without losing your edits | 15:17 |
rosmaita | possibly copy the current version of the file to somewhere out of tree, like your home dir | 15:18 |
rosmaita | then do a git reset HEAD~1 to go back to the current commit | 15:18 |
rosmaita | if you do a git log -n 1 at that point, you should see your commit message from the version that's up in gerrit | 15:19 |
rosmaita | and git status should show no changes | 15:19 |
rosmaita | then copy your saved spec back into the branch | 15:19 |
rosmaita | and git status should show your changes | 15:19 |
rosmaita | and then do commit --amend | 15:20 |
rosmaita | and then git review | 15:20 |
rosmaita | (there may be a better way to do this, but this should work) | 15:20 |
*** openstackgerrit has joined #openstack-glance | 15:20 | |
openstackgerrit | Markus Hentsch proposed openstack/glance-specs master: Spec for the Glance part of Image Encryption https://review.openstack.org/609667 | 15:20 |
mhen | rosmaita, I simply backuped the changed version, reset the branch to the gerrit state and reapplied the file | 15:24 |
mhen | s/backuped/backed up/ | 15:25 |
rosmaita | sounds good | 15:25 |
*** pcaruana has quit IRC | 15:31 | |
*** dpawlik has quit IRC | 15:34 | |
*** dpawlik has joined #openstack-glance | 15:34 | |
*** dpawlik has quit IRC | 15:34 | |
*** dpawlik has joined #openstack-glance | 15:35 | |
*** dpawlik has quit IRC | 15:36 | |
*** dpawlik has joined #openstack-glance | 15:36 | |
*** dpawlik has quit IRC | 15:40 | |
*** dpawlik has joined #openstack-glance | 15:52 | |
*** dpawlik has quit IRC | 15:56 | |
*** jmlowe has quit IRC | 16:01 | |
*** openstackgerrit has quit IRC | 16:24 | |
*** gyee has joined #openstack-glance | 17:12 | |
*** jmlowe has joined #openstack-glance | 18:04 | |
*** rosmaita has left #openstack-glance | 21:45 | |
*** priteau has quit IRC | 22:12 | |
*** openstackgerrit has joined #openstack-glance | 23:42 | |
openstackgerrit | iain MacDonnell proposed openstack/glance-specs master: spec-lite: Embed validation data in locations https://review.openstack.org/597648 | 23:42 |
openstackgerrit | iain MacDonnell proposed openstack/glance master: Embed validation data when setting locations https://review.openstack.org/597368 | 23:45 |
*** gyee has quit IRC | 23:50 |
Generated by irclog2html.py 2.15.3 by Marius Gedminas - find it at mg.pov.lt!