[02:27] <maxb> 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
[09:48] <adeuring> noodles775: I don't see any branch from you that needs a review
[09:49] <noodles775> adeuring: https://code.edge.launchpad.net/~michael.nelson/launchpad/509370-access-non-unique-ppa-name/+merge/19022
[09:49] <noodles775> 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] <noodles775> Thanks!
[09:50] <adeuring> noodles775: argh, right. I just saw curtis's name and thought "that's reviewed"...
[09:50] <noodles775> adeuring: oh, and btw, there are pre-imp discussions on the bug linked from the MP.
[10:32] <adeuring> noodles775: r=me
[10:57] <salgado> noodles775, where's your branch?
[10:59] <noodles775> salgado: adeuring just approved it.
[10:59] <salgado> oh, ok.  I'll remove it from the queue
[11:01] <salgado> adeuring, have you started on maxb's branch as well?
[11:05] <adeuring> salgado: yes, I've started reh review of maxb's branch
[11:11] <salgado> adeuring, I've commented there, but I think noodles775 has landed a branch doing that merge and solving the conflict already
[11:12] <adeuring> salgado: yeah, I've started to look at the current revision of db-devel too ;)
[11:17] <adeuring> 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] <maxb> np
[13:01] <wgrant> bigjools: Can you please have a look at https://code.edge.launchpad.net/~wgrant/launchpad/sprbu-columns-to-sprb/+merge/18995?
[13:01] <bigjools> yep
[13:02] <bigjools> wgrant: looks fine
[13:03] <bigjools> you wanna add some model code with that?
[13:03] <wgrant> bigjools: That's the next branch.
[13:03] <bigjools> ok
[13:03] <wgrant> I hear one is meant to split them up.
[13:03] <bigjools> we'll wait for stub thenm
[13:03] <bigjools> well
[13:03] <bigjools> you don't really need to now we have db-devel
[13:03] <wgrant> Is stub not around at the moment?
[13:03] <wgrant> Ahh.
[13:03] <bigjools> holiday
[13:04] <bigjools> I am blocked on him too
[13:04] <bigjools> my no-more-secpub apocalypse
[13:04] <bigjools> I would go ahead and add the model code to this branch
[13:04] <wgrant> Ah.
[13:04] <wgrant> I already have the other branch up there.
[13:04] <bigjools> unless you have a good reason not to
[13:04] <wgrant> Shall I make an MP?
[13:04] <bigjools> yep
[13:05] <bigjools> oooo
[13:05] <wgrant> Hm?
[13:05] <bigjools> the js scrolls the MP window smoothly to the "add comment" section
[13:05] <bigjools> nice
[13:06] <wgrant> Gecko's interpretation of "smooth" does not meet most, unfortunately.
[13:06] <bigjools> heh
[13:06] <bigjools> seemed ok for me - perhaps KDE handles it better?  <hides>
[13:07] <wgrant> Hm, some sprites are broken on edge.
[13:08] <wgrant> eg. the 'Proposed branch' and 'Merge into' on MPs.
[13:08] <bigjools> yeah I see that too
[13:09] <wgrant> Both Chromium and Firefox as well.
[13:09] <bigjools> and Konq
[14:53] <jtv> adeuring, got time for this easy one?  https://code.launchpad.net/~jtv/launchpad/bug-411514/+merge/19168
[14:53] <adeuring> jtv: sure
[14:53] <jtv> thanks
[14:57] <jtv> noodles775, have you got time for a buildfarm-related review?
[14:57] <jtv> noodles775: it's fairly large: https://code.edge.launchpad.net/~jtv/launchpad/bug-507678/+merge/19131
[14:58] <noodles775> jtv: not right now, but isn't it something the OCR could do?
[14:58]  * noodles775 takes a quick look
[14:59] <jtv> noodles775: I was hoping for someone from the Wellington sprint
[14:59] <noodles775> hrm, text conflict on that MP?
[14:59] <jtv> noodles775: yes... and I'm not getting it with my devel.
[14:59] <noodles775> jtv: I'd be happy to look at it next week, but not today.
[14:59] <jtv> noodles775: that's fine, thanks...  I'll see who's available later
[14:59] <noodles775> ok
[15:20] <adeuring> jtv: r=me
[15:20] <jtv> adeuring: thanks!
[15:20] <jtv> more oopses bite the dust... our only ones atm I think
[15:29] <EdwinGrubbs> 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] <adeuring> EdwinGrubbs: sure
[16:01] <adeuring> EdwinGrubbs: r=me (1 nitpick)
[16:01] <EdwinGrubbs> adeuring: thanks
[16:02] <allenap> adeuring: Up for a short branch? https://code.edge.launchpad.net/~allenap/launchpad/launchpad-naughty-naughty-comment-sync-bug-499113/+merge/19181
[16:02] <adeuring> allenap: sure
[16:03] <allenap> adeuring: Thanks.
[16:13] <gmb> adeuring, salgado-brb: Either of you available to review https://code.edge.launchpad.net/~gmb/launchpad/blobjob-cronscript-bug-513190/+merge/19184?
[16:13] <adeuring> gmb: I'll do it, but have first to finish a review for Gavin
[16:15] <gmb> adeuring: Brilliant, thanks. No huge rush.
[16:17] <adeuring> gmb: The MP shows  a merge conflict. I assume the branch should land on devel, not db-devel?
[16:20] <adeuring> allenap: r=me
[16:20] <gmb> 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] <adeuring> gmb: thanks!
[16:20] <allenap> adeuring: Thank you!
[16:21] <gmb> adeuring: Non-crazy diff posted.
[16:39] <adeuring> 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] <adeuring> gmb: argh, now I see it -- we _have_ these messages...
[16:40] <adeuring> sorry for the noise
[16:43] <adeuring> gmb: r=me
[16:44] <gmb> adeuring: Thanks.