| huwshimi | jujugui: Review please! https://codereview.appspot.com/16940043 | 00:38 |
|---|---|---|
| Makyo | On it | 00:40 |
| benji | bac: https://codereview.appspot.com/16950043 !!!!!!!! | 00:52 |
| bac | benji: finally | 00:52 |
| bac | benji: i approved it a while ago but forgot to ping you | 01:09 |
| benji | bac: ok, looking now | 01:09 |
| rick_h_ | hatch: ping | 04:51 |
| hatch | yo | 04:51 |
| Makyo | rick_h_: The Face of JS at Canonical | 04:56 |
| rick_h_ | Makyo: sssh | 04:56 |
| Makyo | Hahah, sorry :) | 04:56 |
| rick_h_ | Makyo: look, it's a playground, leave me alone :P | 04:56 |
| Makyo | Hahaa | 04:56 |
| hatch | rofl | 04:56 |
| rick_h_ | hatch: said the same exact thing 60s ago | 04:56 |
| rick_h_ | it's my first time doing an org, don't konw wtf I'm doing :P | 04:56 |
| hatch | haha | 04:57 |
| hatch | maybe you shouldn't be championing this :P | 04:57 |
| rick_h_ | it's doooomed! | 04:57 |
| Makyo | Pff, it's fine. | 04:58 |
| hatch | haha | 04:58 |
| rick_h_ | anyway, as you guys can see. Added you to some space to play with testing things. Gathering info, links, hints/tips | 04:58 |
| rick_h_ | please feel free to submit additional information | 04:59 |
| hatch | yeah - we gota figure out how to keep the commit history clean | 04:59 |
| rick_h_ | and start to pull together the full checklist/etc and we should probably talk about this in #cloud-dev | 04:59 |
| hatch | I'm not really sure the best approach for that | 04:59 |
| rick_h_ | so that's the end of the conversation for in here :) | 04:59 |
| hatch | sounds like a plan | 05:01 |
| hatch | rick_h_, so I'm trying to rebase jc's PR but it looks like he merged in master a few times | 05:04 |
| hatch | any idea how to do this? | 05:04 |
| rick_h_ | right, that's what I mean. It gets messy. So you should create a new branch from master, cherry pick his commits | 05:05 |
| rick_h_ | you can do is rebase the ones in a row down to one so you can narrow the number of cherry picks required | 05:05 |
| rick_h_ | hatch: I *think* you can rebase the merges or something, but have to try it out | 05:06 |
| hatch | yeah I'm not having any luck, I'll keep at er | 05:06 |
| rick_h_ | let me know if you want me to pull down and try it out | 05:07 |
| hatch | rick_h_, ok if you'd like :) I'm at a loss https://github.com/jaycee/ghost-charm it's the add-mysql branch | 05:15 |
| rick_h_ | hatch: so you want to just rebase it? | 05:16 |
| hatch | yeah so his PR is 16 commits | 05:16 |
| hatch | I'd like it down to logical commits | 05:16 |
| hatch | or just 1 | 05:17 |
| hatch | but whenever I try it's like it thinks it's already been rebased | 05:17 |
| hatch | I'm sure I'm just missing something - it's been quite a while since I've had to do this | 05:18 |
| rick_h_ | yea, working on it sec | 05:18 |
| rick_h_ | hatch: what do you want the message squashed down to? | 05:24 |
| hatch | adding db-relation-changed and departed hooks for mysql | 05:24 |
| hatch | that pretty much sums it up | 05:24 |
| hatch | id' be very interested to know the commands you used to do that too | 05:25 |
| rick_h_ | yea, sec | 05:26 |
| rick_h_ | bah, what a mess | 05:29 |
| hatch | right? haha | 05:30 |
| rick_h_ | well I rebased a bit too far :) | 05:33 |
| rick_h_ | oh, actually it might be good | 05:34 |
| hatch | :) So these are the types of things we will have to figure out how to avoid | 05:35 |
| rick_h_ | https://github.com/mitechie/ghost-charm/tree/add-mysql | 05:38 |
| rick_h_ | so I've got it cleaned up, I tried to then merge in trunk but have conflicts to handle | 05:39 |
| rick_h_ | hatch: http://paste.mitechie.com/show/1053/ is what I went through | 05:41 |
| rick_h_ | hatch: so each of my commits is resolving rebase conflict issue steps | 05:41 |
| rick_h_ | that might even be able to be shortened but seemed ok atm | 05:42 |
| rick_h_ | anyway, getting late. | 05:42 |
| hatch | cool thanks I'll give this a go | 05:45 |
| hatch | gnt | 05:45 |
| huwshimi | luca__: http://10.155.45.150:8888/ | 16:14 |
| hatch | jujugui looking for a review https://codereview.appspot.com/17340043/ | 21:05 |
| antdillon | hatch, lp:~ya-bo-ng/juju-gui/onboarding-continued | 21:54 |
| abentley | bac: Could you please review https://code.launchpad.net/~abentley/charmworld/remove-018-migration/+merge/192749 | 23:22 |
| bac | abentley: done | 23:26 |
| abentley | bac: Thanks! | 23:26 |
| abentley | bac, revno 231 is now deployed. | 23:37 |
| abentley | to staging. | 23:37 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!