[18:45:34] Hello :) [18:46:14] If alolita is looking for me, I am around :) [18:46:48] Same :P [18:48:48] we all are :) [18:50:14] suddenly I am wondering if I have missed my appointment with her doh [18:50:45] pdhanda: ping [18:52:56] awjr: you back in the states but in the east bay? [18:53:46] tomaszf: yeah, i got home last night and am wfh today [18:54:22] was originally planning to do an in-lieu day but too much to do [18:58:55] good because otherwise i'd tell you to go to sleep [18:58:56] gotcah [20:07:48] awjr: pong [20:07:55] sorry was out at lunch [20:07:57] hello :) [20:07:58] no worries [20:08:14] i'd like to add a component to bugzilla [20:08:20] are you the right person to talk to about that? [20:08:23] sure [20:08:56] i'd like to add a component like 'fundraising - misc' to cover bits of the fundraising pipeline that aren't covered by existing components (eg MW extensions and CiviCRM) [20:11:20] oops [20:11:39] awjr in the Product: Wikimedia? [20:11:44] yeah [20:11:50] pdhanda: ^ [20:12:39] awjr: description of the component? [20:13:23] how about 'a catch-all for miscellaneous fundraising-related components not covered by mediawiki extensions and civicrm' [20:14:02] "Fundraising - misc" right? [20:14:24] awjr: you want a default assignee? [20:14:48] pdhanda: perfect - you can make it me [20:15:56] awjr: done [20:16:09] :) [20:16:12] you're the best thanks pdhanda [20:17:57] glad i could help [21:21:05] considering that I am patching wmf live I assume it's normal to patch 1_18 at the same time? [21:21:11] I'll get a review for it :) [21:21:33] neilk_, you can just tag it 1.18 and have it merged later [21:21:35] probably simpler :) [21:21:56] ok what should the tag look like [21:22:21] or actually no [21:22:32] literally in CR, add a tag of "1.18" [21:22:38] brion explained to me that the patch needs to be subtly different in 1_18, trunk, and 1.17wmf1 [21:22:45] so I'll do the patch manually :( [21:22:56] another reason why i don't like our release branch being 6 months+ behind [21:23:00] Ohh, not a simple merge [21:23:02] Right :) [21:23:07] Yeah, DIY ;) [21:33:15] neilk_: If patching WMF live, patch trunk if needed [21:33:29] well, I already committed to trunk [21:33:42] But yeah if the nature is such that every branch needs a different patch (it happens), just do all of them by hand and cross-reference the revids in your commit summaries [21:33:46] but I think I'll wait for the review on trunk because there might be other things [21:33:49] wrong with it [21:33:53] Right [21:34:11] 1_18 is way behind and the change doesn't even make *sense* there :) [21:34:15] Yeah [21:34:19] So svn merge would just explode [21:34:29] this makes me sad [21:34:31] In that case, probably best to either not tag it 1.18 or leave a comment warning of this [21:34:31] but anyway [21:34:40] yes, perhaps [21:34:44] Best is probably you just do it, I guess [21:35:00] or i can make the code flexible enough for both cases [21:35:18] I wouldn't worry too much about that kind of freakish backwards compat [21:35:20] <^demon> 1.18 is a kind of arbitrary and crappy branch. [21:35:34] <^demon> I would kind of like to rebranch. [21:36:13] RoanKattouw: it's pretty simple, a library just moved [21:36:24] Right [21:36:34] Except src/dst file names don't match due to path restructuring or some other cause [21:37:02] ? [21:37:16] oh crap, actually a lot of libraries moved. [21:37:35] oh well, I can deal. [21:38:08] Cool [21:38:42] As for policy/review considerations, just make sure everything's linked as follow-ups the usual way with rev numbers in the commit summary