=== maxb changed the topic of #launchpad-reviews to: on call: - || reviewing: - || queue [noodles775, maxb] || This channel is logged: http://irclogs.ubuntu.com || https://code.edge.launchpad.net/launchpad/+activereviews [02:27] I expect the next automatic merge from stable to db-devel to fail with a conflict. The branch I've just put in the topic is that merge with the conflict resolved === adeuring changed the topic of #launchpad-reviews to: on call: adeuring || reviewing: - || queue [noodles775, maxb] || This channel is logged: http://irclogs.ubuntu.com || https://code.edge.launchpad.net/launchpad/+activereviews [09:48] noodles775: I don't see any branch from you that needs a review [09:49] adeuring: https://code.edge.launchpad.net/~michael.nelson/launchpad/509370-access-non-unique-ppa-name/+merge/19022 [09:49] It's got a ui and text approval (I've got a minor ui tweak to do, bit it's just a letter change). [09:50] Thanks! [09:50] noodles775: argh, right. I just saw curtis's name and thought "that's reviewed"... [09:50] adeuring: oh, and btw, there are pre-imp discussions on the bug linked from the MP. [10:32] noodles775: r=me === matsubara-afk is now known as matsubara [10:57] noodles775, where's your branch? [10:59] salgado: adeuring just approved it. [10:59] oh, ok. I'll remove it from the queue === salgado changed the topic of #launchpad-reviews to: on call: adeuring || reviewing: - || queue [maxb] || This channel is logged: http://irclogs.ubuntu.com || https://code.edge.launchpad.net/launchpad/+activereviews [11:01] adeuring, have you started on maxb's branch as well? === salgado changed the topic of #launchpad-reviews to: on call: adeuring,salgado || reviewing: - || queue [maxb] || This channel is logged: http://irclogs.ubuntu.com || https://code.edge.launchpad.net/launchpad/+activereviews [11:05] salgado: yes, I've started reh review of maxb's branch === adeuring changed the topic of #launchpad-reviews to: on call: adeuring,salgado || reviewing: maxb, - || queue [] || This channel is logged: http://irclogs.ubuntu.com || https://code.edge.launchpad.net/launchpad/+activereviews [11:11] adeuring, I've commented there, but I think noodles775 has landed a branch doing that merge and solving the conflict already [11:12] salgado: yeah, I've started to look at the current revision of db-devel too ;) [11:17] maxb. I'm removing your branch from the queue, because another branch from noodles775 already resolved the conflicts. But thanks for your work nevertheless! [11:17] np === adeuring changed the topic of #launchpad-reviews to: call: adeuring,salgado || reviewing: -, - || queue [] || This channel is logged: http://irclogs.ubuntu.com || https://code.edge.launchpad.net/launchpad/+activereviews === salgado is now known as salgado-afk === mrevell is now known as mrevell-lunch [13:01] bigjools: Can you please have a look at https://code.edge.launchpad.net/~wgrant/launchpad/sprbu-columns-to-sprb/+merge/18995? [13:01] yep [13:02] wgrant: looks fine [13:03] you wanna add some model code with that? [13:03] bigjools: That's the next branch. [13:03] ok [13:03] I hear one is meant to split them up. [13:03] we'll wait for stub thenm [13:03] well [13:03] you don't really need to now we have db-devel [13:03] Is stub not around at the moment? [13:03] Ahh. [13:03] holiday [13:04] I am blocked on him too [13:04] my no-more-secpub apocalypse [13:04] I would go ahead and add the model code to this branch [13:04] Ah. [13:04] I already have the other branch up there. [13:04] unless you have a good reason not to [13:04] Shall I make an MP? [13:04] yep [13:05] oooo [13:05] Hm? [13:05] the js scrolls the MP window smoothly to the "add comment" section [13:05] nice [13:06] Gecko's interpretation of "smooth" does not meet most, unfortunately. [13:06] heh [13:06] seemed ok for me - perhaps KDE handles it better? [13:07] Hm, some sprites are broken on edge. [13:08] eg. the 'Proposed branch' and 'Merge into' on MPs. [13:08] yeah I see that too [13:09] Both Chromium and Firefox as well. [13:09] and Konq === mrevell-lunch is now known as mrevell === jml is now known as jml-afk === jml-afk is now known as jml [14:53] adeuring, got time for this easy one? https://code.launchpad.net/~jtv/launchpad/bug-411514/+merge/19168 [14:53] jtv: sure [14:53] thanks === jamalta is now known as jamalta-afk [14:57] noodles775, have you got time for a buildfarm-related review? [14:57] noodles775: it's fairly large: https://code.edge.launchpad.net/~jtv/launchpad/bug-507678/+merge/19131 [14:58] jtv: not right now, but isn't it something the OCR could do? [14:58] * noodles775 takes a quick look [14:59] noodles775: I was hoping for someone from the Wellington sprint [14:59] hrm, text conflict on that MP? [14:59] noodles775: yes... and I'm not getting it with my devel. [14:59] jtv: I'd be happy to look at it next week, but not today. [14:59] noodles775: that's fine, thanks... I'll see who's available later [14:59] ok === matsubara is now known as matsubara-lunch === salgado-afk is now known as salgado [15:20] jtv: r=me [15:20] adeuring: thanks! [15:20] more oopses bite the dust... our only ones atm I think [15:29] adeuring, salgado: can one of you review my branch. It looks big, but a large part was just indenting code, and the rest is very simple. https://code.edge.launchpad.net/~edwin-grubbs/launchpad/bug-513260-registry-js-module-names/+merge/19142 [15:29] EdwinGrubbs: sure === salgado is now known as salgado-brb [16:01] EdwinGrubbs: r=me (1 nitpick) [16:01] adeuring: thanks [16:02] adeuring: Up for a short branch? https://code.edge.launchpad.net/~allenap/launchpad/launchpad-naughty-naughty-comment-sync-bug-499113/+merge/19181 [16:02] allenap: sure [16:03] adeuring: Thanks. === matsubara-lunch is now known as matsubara [16:13] adeuring, salgado-brb: Either of you available to review https://code.edge.launchpad.net/~gmb/launchpad/blobjob-cronscript-bug-513190/+merge/19184? [16:13] gmb: I'll do it, but have first to finish a review for Gavin [16:15] adeuring: Brilliant, thanks. No huge rush. [16:17] gmb: The MP shows a merge conflict. I assume the branch should land on devel, not db-devel? [16:20] allenap: r=me [16:20] adeuring: Arse. No, it has to land on db-devel, but I think I originally branched from devel in a moment of craziness. I'll post a proper diff, hang on... [16:20] gmb: thanks! [16:20] adeuring: Thank you! [16:21] adeuring: Non-crazy diff posted. [16:39] gmb: Checking "uuid is None" is good -- but shouldn't we also add a notice when this happens. Something like "sorry, semthing went wrong with storing the debug data. The OOPS ID is..."? [16:40] gmb: argh, now I see it -- we _have_ these messages... [16:40] sorry for the noise [16:43] gmb: r=me [16:44] adeuring: Thanks. === deryck is now known as deryck[lunch] === gary_poster is now known as gary-lunch === deryck[lunch] is now known as deryck === adeuring changed the topic of #launchpad-reviews to: on call: salgado || reviewing: - || queue [] || This channel is logged: http://irclogs.ubuntu.com || https://code.edge.launchpad.net/launchpad/+activereviews === gary-lunch is now known as gary_poster === salgado-brb is now known as salgado === matsubara is now known as matsubara-afk === salgado is now known as salgado-afk