[10:20:33] fiy, about merging A into B / B into A: [10:20:39] http://git.661346.n2.nabble.com/Newbie-question-regarding-3way-merge-order-td2241701.html [10:21:15] after looking through that and asking in #git, i'm not convinced that yes, merge is commutative wrt the resulting source code. [10:21:47] so merging A into B results in the same code as merging B into A. Well, if there are conflicts, the conflict markers look a bit different. [10:22:06] And of course the result will end up on a different branch, and the merged history may look a bit different. [10:22:46] Also, the poarents of a merge commit have an explicit order, which would reflect whether you merged A into B or B into A. [10:23:08] But all of this is not relevant if you just merge in order to try whether some patch applies cleanly and passes tests. [10:30:19] hm... [10:30:37] foooooood.... neeeed fooood... [10:30:40] anyone up for lunch? [10:38:05] Daniel_WMDE: ha! [10:38:23] Daniel_WMDE: that's more or less what I said. or mumbled, rather [10:38:32] yea, just wanted to make sure [13:14:46] https://bugs.php.net/bug.php?id=50731 [13:15:25] and https://bugs.php.net/bug.php?id=49143 [14:52:03] taadaaa! [14:53:01] jeblad: I have 3 failings tests: http://dpaste.org/7gnaR/ [14:53:13] Oh noooo.... [14:59:58] Fail Early, Fail Often….. SCNR [15:00:29] JeroenDeDauw: pls check your private messages in IRC [15:23:27] Katie_WMDE: can you review and merge this? https://gerrit.wikimedia.org/r/#/c/8751/ [15:23:38] ok [15:24:37] oh no, namespaces [15:29:11] JeroenDeDauw: One of the tests that is dependent on a specific setup in the LocalSettings. Should either check the current setup or override the setup. [15:29:47] I guess I call it an user error on your part! =D [15:30:29] ..or simply an incomplete test [16:21:29] Danwe_WMDE: can you quicly review this small change? https://gerrit.wikimedia.org/r/#/c/8780/ [16:21:42] Otherwise I cannot easily test the stuff I', nuilding on top of that [19:45:11] ah, thought I'd mention it : a few french wondered about wikidata being able to replace the wiktionary almost as a whole [19:45:24] after all, it's a list of term definitions in every languages [20:08:46] hey DarkoNeko :) [20:09:06] good evening :) [20:09:17] yeah that should be possible if people think it is a good thing to do and put a bit of work into it [20:09:59] there's probably a bit "more" that would be in the article itself, tho. but I haven't looked too deep on the feasability [20:10:09] *nod* [22:43:16] hello, I am Max the new Wikipedian in Residence with OCLC. OCLC hosts the worlds largest library database at 264 million records, and I wanted to know if we could make a partnership to put it in Wikidata. [22:43:28] Who should I contact about this? [22:46:46] Hello, max_oclc [22:47:36] It sounds interesting, what kind of partnership are you thinking about? [22:49:33] We could supply you with the metadata for all our books. [22:50:40] We are also a non-profit, our mission is just to get people to libraries. So if you visit a record on our website it gives you data on where the closest library is to you that has that book. [22:51:24] Right now, in Template:Infobox book, there is a variable for oclcnumber and then the template autolinks to where is the closest library that has it. [22:52:34] like if you visit http://en.wikipedia.org/wiki/Snowcrash and in the infobox click the the OCLC number [22:52:59] right now there are 20,000 articles that link to worldcat.org which is our database [22:53:56] Yes, I'm seeing now... I didn't know much about this, as I'm used mainly to Wikipedia in Spanish [22:54:25] But certainly it can be very useful [22:54:28] worldcat.org has data worldwide partnerships even with spanish libraries [22:56:30] Yes, and I see we (es.wiki) have also linked identities from worldcat.org [22:59:41] who are the right people to talk to about a partnership? [22:59:53] should I post to the mailing list? [23:00:44] You could, anyway Lydia_WMDE is in charge of communications [23:01:04] But I guess she's sleeping now :) [23:01:17] early; only midnight. [23:01:46] 1 am Europe time :) [23:02:13] cest? [23:02:30] max_oclc, most of day time you can find her in the channel [23:02:41] Yes, CEST [23:02:42] :) [23:03:08] But you can write to the list if you prefer [23:03:08] very good [23:03:27] The idea is really interesting [23:03:48] max_colc: have you looked at [[WP:Microformats]]? [23:03:49] 10[1] 10http://meta.wikimedia.org/wiki/WP:Microformats [23:03:56] mmm, on en. [23:04:16] I think an OCLC property should be almost a must for people who is in there [23:04:49] [[en:WP:Microformats]] [23:04:49] 10[2] 10http://en.wikipedia.org/wiki/WP:Microformats [23:14:58] hi max_oclc [23:15:34] Hi Aude [23:15:49] it's like 1 am here so can't chat long [23:16:10] but we've thought about using wikidata to structure and store reference information [23:16:18] or that people might want to do that [23:16:20] no, worries, I'll move this conversation onto the mailing list as well [23:16:28] sure [23:16:44] right now we're doing the easy stuff :) [23:16:55] I understand [23:17:09] which is language links, then infoboxes (a bit complicated) [23:17:47] then using bits of data inline in articles, and how far we get with that depends on how we do with infoboxes [23:17:54] or how quick [23:19:49] how do you imagine displaying information without infoboxes [23:20:17] just transclusion of facts, like {{publicationdate|author=Karl Marx}}? [23:20:18] max_oclc: we have a discussion about that and don't know yet [23:20:18] 10[3] 10http://meta.wikimedia.org/wiki/Template:publicationdate [23:20:32] let me look [23:21:24] http://lists.wikimedia.org/pipermail/wikidata-l/2012-May/thread.html [23:21:37] all the RFC for syntax stuff [23:21:50] and https://meta.wikimedia.org/wiki/Wikidata/Notes/Inclusion_syntax [23:23:01] max_oclc: now if id numbers like oclc number could be cc-0 or such, that would be useful [23:24:36] http://en.wikipedia.org/wiki/Right_as_Rain (example and we use oclc number anyway, already in the info box) [23:25:17] yup, I looked into the way that infobox works. [23:25:31] We'd like to deploy that on a large scale, like with wikidata [23:26:25] cool [23:27:45] lydia will be back on tuesday i think, but available on irc and email before then [23:27:51] and denny [23:28:46] and we have irc office hours on tuesday [23:28:52] http://meta.wikimedia.org/wiki/Wikidata/Events [23:31:35] great, I'll be there for the office hours, and send a message to the list now