*** rossella_s has quit IRC | 01:06 | |
*** rossella_s has joined #openstack-neutron-release | 01:06 | |
*** yamamoto has joined #openstack-neutron-release | 03:01 | |
*** rossella_s has quit IRC | 05:06 | |
*** rossella_s has joined #openstack-neutron-release | 05:06 | |
*** amotoki has joined #openstack-neutron-release | 07:55 | |
*** yamamoto_ has joined #openstack-neutron-release | 08:44 | |
*** yamamoto has quit IRC | 08:44 | |
*** yamamoto has joined #openstack-neutron-release | 08:44 | |
*** yamamoto_ has quit IRC | 08:48 | |
*** salv-orl_ has joined #openstack-neutron-release | 09:56 | |
*** salv-orlando has quit IRC | 10:00 | |
*** salv-orl_ has quit IRC | 10:04 | |
*** salv-orl_ has joined #openstack-neutron-release | 10:05 | |
*** salv-orl_ has quit IRC | 10:10 | |
*** salv-orlando has joined #openstack-neutron-release | 10:11 | |
*** salv-orl_ has joined #openstack-neutron-release | 10:13 | |
*** salv-orlando has quit IRC | 10:16 | |
*** salv-orlando has joined #openstack-neutron-release | 10:25 | |
*** salv-orl_ has quit IRC | 10:26 | |
*** salv-orl_ has joined #openstack-neutron-release | 10:48 | |
*** salv-orlando has quit IRC | 10:51 | |
*** salv-orl_ has quit IRC | 10:51 | |
*** salv-orlando has joined #openstack-neutron-release | 10:52 | |
*** salv-orl_ has joined #openstack-neutron-release | 11:21 | |
*** salv-orl_ has quit IRC | 11:24 | |
*** salv-orl_ has joined #openstack-neutron-release | 11:24 | |
*** salv-orlando has quit IRC | 11:25 | |
*** salv-orl_ has quit IRC | 11:34 | |
*** salv-orlando has joined #openstack-neutron-release | 11:35 | |
*** salv-orl_ has joined #openstack-neutron-release | 12:23 | |
*** salv-orlando has quit IRC | 12:27 | |
*** salv-orlando has joined #openstack-neutron-release | 12:29 | |
*** salv-orl_ has quit IRC | 12:30 | |
*** salv-orl_ has joined #openstack-neutron-release | 12:36 | |
*** salv-orlando has quit IRC | 12:36 | |
*** yamamoto has quit IRC | 12:56 | |
*** carl_baldwin has joined #openstack-neutron-release | 14:14 | |
*** salv-orl_ has quit IRC | 14:43 | |
*** yamamoto has joined #openstack-neutron-release | 14:43 | |
*** salv-orlando has joined #openstack-neutron-release | 14:43 | |
*** salv-orlando has quit IRC | 14:44 | |
*** salv-orlando has joined #openstack-neutron-release | 14:44 | |
*** salv-orlando has quit IRC | 15:15 | |
*** yamamoto has quit IRC | 16:56 | |
*** salv-orlando has joined #openstack-neutron-release | 17:24 | |
*** salv-orlando has quit IRC | 17:29 | |
*** salv-orlando has joined #openstack-neutron-release | 17:30 | |
*** salv-orlando has quit IRC | 17:48 | |
*** yamamoto has joined #openstack-neutron-release | 17:57 | |
*** yamamoto has quit IRC | 18:02 | |
*** carl_baldwin has quit IRC | 18:18 | |
*** salv-orlando has joined #openstack-neutron-release | 19:04 | |
*** salv-orlando has quit IRC | 19:12 | |
*** carl_baldwin has joined #openstack-neutron-release | 19:13 | |
HenryG | mestery: ping | 19:16 |
---|---|---|
HenryG | mestery: what does it take to create a feature branch in a stadium repo? | 19:17 |
HenryG | kevinbenton: maybe you know? | 19:17 |
*** carl_baldwin has quit IRC | 19:19 | |
kevinbenton | HenryG: i think kyle or armando | 19:22 |
kevinbenton | HenryG: need to do it | 19:22 |
kevinbenton | or dougwig | 19:23 |
dougwig | ttx or dhellman, i think. | 19:23 |
dougwig | depends on who has create perms in the gerrit acls. | 19:23 |
dougwig | and be SURE to name it "feature/*", or the ci scripts will puke. | 19:23 |
kevinbenton | oh yeah, sorry i was thinking of a merge commit | 19:23 |
kevinbenton | not creating a branch | 19:24 |
dougwig | HenryG: what repo? | 19:24 |
HenryG | dougwig: guess ;) | 19:24 |
dougwig | networking-flavor-chaining ? | 19:24 |
HenryG | no, networking-intent | 19:24 |
mestery | No | 19:26 |
mestery | We can create those | 19:26 |
dougwig | i can create them in a lot of networking-. if it's neutron, ask ttx. | 19:26 |
mestery | feature branches | 19:26 |
dougwig | aha, there's the man. | 19:26 |
mestery | Well, dougwig, I think you can do it for Neutron as well to be honest using gerrit | 19:26 |
dougwig | i tried. let me look again. | 19:26 |
mestery | exervising | 19:26 |
mestery | OK | 19:26 |
mestery | checking as well | 19:26 |
dougwig | i don't see anything but a display list. | 19:27 |
dougwig | of branches | 19:27 |
HenryG | Once my feature branch is created, is there some documentation on how to resync to master (which we would need to do periodically) and how to collapse to master when the feature is done? | 19:30 |
*** carl_baldwin has joined #openstack-neutron-release | 19:33 | |
*** salv-orlando has joined #openstack-neutron-release | 19:46 | |
*** amotoki has quit IRC | 20:03 | |
kevinbenton | HenryG: resyncing is a pain | 20:04 |
kevinbenton | HenryG: you have to have dougwig, mestery, or armax propose a merge commit | 20:04 |
mestery | HenryG: What are you using the feature branch for by chance? | 20:04 |
kevinbenton | HenryG: i think feature branches are not worth the effort if you can avoid them :( | 20:04 |
HenryG | Why can't it be as easy as 'git rebase master' ? | 20:05 |
kevinbenton | HenryG: rebasing changes all of the commits | 20:05 |
*** salv-orlando has quit IRC | 20:05 | |
kevinbenton | HenryG: you can't push a rebase to a remote tree | 20:05 |
kevinbenton | because it's changing history | 20:06 |
dougwig | HenryG: here's the docs for it: http://docs.openstack.org/infra/manual/drivers.html | 20:07 |
dougwig | HenryG: in neutron, you need to find someone in the neutron-release group to do the steps. | 20:07 |
HenryG | I want feature branches because teams of people work on a feature in some private clone repo somewhere and then suddenly show up with a titanic code dump. | 20:07 |
HenryG | I would prefer to give them a way to work openly upstream. | 20:08 |
kevinbenton | unfortunately what happens (at least with neutron) is that people are working upstream, but nobody is reviewing everything that goes in | 20:09 |
kevinbenton | and then when the merge commit comes around, there is no good way to review it | 20:09 |
*** salv-orlando has joined #openstack-neutron-release | 20:15 | |
*** salv-orlando has quit IRC | 20:16 | |
*** salv-orlando has joined #openstack-neutron-release | 20:31 | |
mestery | HenryG: what kevinbenton said there | 21:14 |
HenryG | mestery: so what is the solution to allow folks to work openly on a big feature that may be disruptive to master, or may not be release-ready until the next cycle? | 22:12 |
*** carl_baldwin has quit IRC | 22:36 | |
*** carl_baldwin has joined #openstack-neutron-release | 22:45 | |
*** salv-orl_ has joined #openstack-neutron-release | 22:56 | |
*** salv-orlando has quit IRC | 22:59 | |
*** salv-orl_ has quit IRC | 23:43 | |
*** yamamoto has joined #openstack-neutron-release | 23:48 |
Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!