[17:59:50] OK great [17:59:55] We have a meeting and my SIP client hangs [18:00:15] :( [18:59:56] awjr: Are Neil and Trevor still there or have they gone to lunch? [19:11:36] Duesentrieb are you around [19:12:20] alolita the blog post I promised is being proof read by a Romanian for correct facts [19:13:43] GerardM-: i'm around, but a bit busy. [19:14:02] and yes, i saw Krinle's mails, but i didn't look closely yet. [19:15:28] not the subject [19:15:44] the question is what is the latest status of OSM for other Wikipedias ? [19:17:07] of particular interest is that we can get many more maps if we can do the overlaying trick and the functionality of the New York Public Library [19:18:37] RoanKattouw: sorry, just saw your msg - they're at lunch [19:49:14] Yeah I thought they would be [19:49:26] Sent them an e-mail asking them to get on IRC when they get back [22:01:47] Oh hey neilk_ [22:02:00] hey man, sorry I was talking with people for a few hrs [22:02:10] I'm going to bed really soon now cause the deployment is in 9 hours and I'd like to sleep for 8 of them [22:02:18] yes please do [22:02:32] I merged the uwdeploy revs into 1.17wmf1 locally [22:02:35] Lots of stupid conflicts [22:02:44] what? [22:02:49] I would deploy them in advance to see how they hold up if it weren't midnight [22:02:49] seriously, there was hardly any [22:02:58] Whitespace stuff, and SVN being stupid [22:03:05] ok [22:03:12] And the fac that one of them was like 6k revs old [22:03:15] we'll try that again tomorrow morning then [22:03:18] wow [22:03:44] ok are there any other barriers? [22:03:46] 78426 [22:03:50] Not that I know of [22:03:51] is all the extension code reviewed? [22:03:58] All except the language library [22:04:33] But I'll review that later, it's not called in a way that can impact security unless you had a monkey write it [22:05:18] I'll set my alarm for 11pm PDT (8am my time) [22:05:27] So I should pop back in here around 11:30 [22:05:33] most of this stuff is marked new, still... [22:05:43] not that I expected you to review everything in UW? [22:05:45] Oh the extension revs? [22:05:48] y [22:05:58] I just diffed the two versions of UW against each other and reviewed that [22:06:03] oh right [22:06:12] branches [22:06:13] Didn't update statuses in CR [22:06:31] 1.17wmf1 of UW should directly correspond to some historic trunk version of UW AFAIK [22:06:40] nod [22:06:59] what if I try to resolve these conflicts, can I commit to 1.17wmf1 ? [22:07:01] As opposed to MediaWiki in general [22:07:12] If you have permission to commit to it, yes [22:07:26] I don't know that I do [22:07:36] I would kinda prefer you not commit to wmf1 now cause I've got local changes that took conflict resolution to acheive [22:07:38] I figured that's sort of what I needed you for [22:07:41] ok [22:07:42] And I don't really want to commit them yet [22:07:54] once you commit that we can try it on commons.prototype [22:08:00] Well you also need someone to run svn up on fenari and sync the changes out [22:08:02] Oh OK [22:08:12] commons.prototype runs 1.17wmf1? [22:08:15] no [22:08:23] I can send you a diff [22:08:24] /wiki/ runs trunk [22:08:32] /uwd/ currently runs 1.16wmf1 [22:08:36] Oh OK [22:08:39] Well how about this [22:08:47] I send you a diff of my local changes and go to sleep [22:08:58] ok [22:09:00] You switch /uwd to 1.17wmf1 and apply my diff [22:09:09] yes [22:09:44] BTW I have one more change I want to add but it's solely in extensions space. [22:10:02] OK [22:10:05] and configuration -- there will be LocalSettings.php changes when we push this [22:10:12] I will copy the extension over tonight [22:10:16] Ah [22:10:26] Prep those LocalSettings.php in a pastebin or something [22:10:31] rogerwilco [22:11:31] The next round of performance reviews I will tell Danese that you should be kept even if it's just for referencing everything that's cool [22:11:40] I really enjoyed the portal song comments in that JS code [22:12:16] RoanKattouw: heh. I'm glad I left them in [22:12:43] Alright patch sent [22:12:59] The SVN path of the code it's against is /branches/wmf/1.17wmf1 [22:14:07] right. I'll fix that locally [22:17:44] Alright, see you in 8 hours