[18:19:51] <RoanKattouw>	RobH: The sekrit channel isn't letting me in
[18:19:58] <RoanKattouw>	Oh wait
[18:20:04] *RoanKattouw 	identifies to services
[18:20:16] <RoanKattouw>	RobH: Never mind, I'm stupid
[18:21:42] <apergos>	:-P
[18:21:51] <jorm>	what sekrit channel?
[18:22:25] <apergos>	shhh
[18:22:30] <apergos>	can't tell you, it's a s33krit
[18:22:36] <jorm>	gorrammit.
[18:26:02] <RoanKattouw>	^demon: So, 1.17 merges
[18:30:26] <RoanKattouw>	^demon: How exactly can I help?
[18:40:07] <^demon>	Sanity checking the ones I've already done would be helpful.
[18:40:48] <RoanKattouw>	OK
[18:43:07] <^demon>	(I just sat down to eat myself, hence the delays)
[18:45:35] <saper>	don't eat yourself! :)
[18:46:07] <RoanKattouw>	Ah ok
[18:46:15] <RoanKattouw>	You cannibal!
[18:46:37] <RoanKattouw>	Only REL1_17 right?
[18:46:51] <Reedy>	Autocannibalism
[18:48:41] <^demon>	I merged a few other things from 1.17wmf1 to trunk, but it's mostly merges to REL1_17, yeah
[18:49:17] <RoanKattouw>	OK
[18:50:56] <apergos>	food
[18:51:02] <apergos>	how does this happen???
[18:51:07] <apergos>	no lunch *again*?
[18:51:44] <RoanKattouw>	^demon: In r84548 the installTables->createTables changes seem to be missing
[18:52:05] <RoanKattouw>	All changes to includes/installer in fact
[18:52:39] <^demon>	How did I miss those?
[18:52:46] <RoanKattouw>	svn merge .... includes/db
[18:52:58] <RoanKattouw>	I'm thinking they may or may not have been introduced by future merges
[18:53:18] <RoanKattouw>	The one I'm talking about now was on Mar 22
[19:05:26] <^demon>	That seems likely. Wonder if we shouldn't just revert and start over.
[19:06:07] <RoanKattouw>	Is REL1_17 borked now?
[19:07:05] <^demon>	Reedy fixed some things I borked already. MessageCache is still wrong, need to de-merge the adaptive stuff
[19:13:13] <RoanKattouw>	OK
[19:13:19] <RoanKattouw>	So you still need me to go over the rest of the merges?
[19:14:11] <Reedy>	I don't think it's in that bad of a shape
[19:14:17] <Reedy>	I tried to install 1.17, but found a bug, so didn't carry on for the moment :P
[19:16:17] <^demon>	Let me finish eating, then I'll a) sort out the message cache things I messed up, and b) see what shape the installer is (could've sworn I got that one right...)
[19:16:21] <^demon>	Then we'll move from there.
[19:25:12] <RoanKattouw>	^demon: Is the 5.2.3 requirement supposed to be in 1.17 or 1.18?
[19:25:26] <Reedy>	Tim added it for 1.18 iirc
[19:26:01] <RoanKattouw>	Well at least part of it crept into 1.17
[19:26:08] <RoanKattouw>	+	// This is the absolute minimum PHP version we can support
[19:26:10] <RoanKattouw>	+	const MINIMUM_PHP_VERSION = '5.2.3';
[19:26:49] <^demon>	I added the 5.2.0 to trunk, and Tim bumped it to 5.2.3
[19:26:54] <^demon>	For 1.17, that should be 5.1.something
[19:26:59] <RoanKattouw>	OK
[19:27:01] <RoanKattouw>	Noting on commit
[19:31:51] <^demon>	Installer is fine, only differences between REL1_17 and trunk are i18n and the removed 1.18 update.
[19:32:24] <RoanKattouw>	Foos
[19:32:26] <RoanKattouw>	*Good
[19:32:34] <RoanKattouw>	Well, not good with respect to the 5.2.3 req
[19:33:08] <^demon>	Right, I just need to pick a version in 5.1.x
[19:33:21] <^demon>	We could just put 5.1.0, but I dunno if that's actually true.
[19:38:38] <jorm>	i'm bored so i think i'm going to just start designing shit.
[19:39:03] <Reedy>	Designer dog turd?
[19:40:31] <jorm>	exactly.
[19:41:03] <jorm>	i have some ideas on how to do UX for template editing in an RTE.
[19:56:41] <jorm>	I need to figure out a better way to handle the massive file sizes in LQT photoshop files.
[19:56:59] <Reedy>	Faster computer?
[19:59:58] <jorm>	ram, mostly.
[20:00:17] <jorm>	the problem is that the LQT file has about 5,000 layers in it.  most of those are combination sets that make up single elements.
[20:00:51] <jorm>	for example, a single "Reply Button" is 3 layers:  background, "Reply", and plus icon.  So multiply that by, oh, 100.
[20:01:11] <jorm>	better to have a single "reply button" object i can insert and such.  but i was lazy when i started on this file so i didn't set it up right.
[20:01:14] <jorm>	now i'm going back into it.
[20:04:18] <Nikerabbit>	hmm? the new version?
[20:27:53] <jorm>	yeah.
[20:28:05] <jorm>	there are other things i've been thinking about since the last pass i made, too.
[20:28:13] <jorm>	interface smidgens.  behaviors.
[20:28:19] <jorm>	like "maximum comment depth"
[20:28:20] <jorm>	etc.
[20:56:55] <^demon>	RoanKattouw: I skipped merging some Javascript distiller fixes r82340, 44, 84 and 99. They wouldn't merge cleanly at all.
[20:57:16] <RoanKattouw>	Hmm OK
[20:57:28] <RoanKattouw>	Just pull in the trunk version of that file
[20:59:45] *^demon 	makes a note
[21:24:43] *^demon 	rebranches REL1_17 from trunk and calls it a day ;-)
[21:24:58] <RoanKattouw>	haha
[21:25:09] <RoanKattouw>	Oh, reminds me
[21:25:30] <RoanKattouw>	A newspaper in these parts had a small article about March Madness, and I notice VCU had made the final 4
[21:25:37] <RoanKattouw>	How did they fare?
[21:25:44] <RoanKattouw>	*noticed
[21:25:52] <^demon>	Tip off for the semifinal is in 30 minutes.
[21:26:08] <^demon>	I was hoping to have this merge clusterfsck sorted by then.
[21:26:12] <^demon>	But that seems unlikely.
[21:27:02] <RoanKattouw>	Well by all means go watch your game
[21:27:19] <RoanKattouw>	I'm reviewing your merges while occasionally wrestling with my attempt to upgrade a 32-bit system to 64-bit in-place
[21:27:30] <RoanKattouw>	And I'm pretty sure I'm screwed now
[21:27:53] <^demon>	Whether or not I get back to it tonight will depend entirely on whether we win or not
[21:28:02] <^demon>	If we win, all bets on me coming home at a decent hour are off.
[21:33:46] <RoanKattouw>	Understood
[21:34:01] <RoanKattouw>	I'll see how far I get digging through your merges
[21:34:04] <RoanKattouw>	As it's almost midnight
[21:37:51] <^demon>	I've got all day tomorrow to work on it, so I can finalize things then
[21:41:07] <jorm>	fingers:  thrashed.