Times are UTC Toggle Colours
00:40:36 *** Zuu has quit IRC 00:43:18 *** welshdragon has quit IRC 01:04:35 *** KenjiE20|LT has joined #openttdcoop.devzone 01:04:40 *** KenjiE20 has quit IRC 01:08:39 *** Phazorx has left #openttdcoop.devzone 02:34:14 *** KenjiE20|LT has quit IRC 02:35:38 *** KenjiE20|LT has joined #openttdcoop.devzone 03:50:20 *** KenjiE20|LT has quit IRC 04:18:18 *** PeterT has quit IRC 04:18:31 *** PeterT has joined #openttdcoop.devzone 05:11:12 *** PeterT has quit IRC 08:04:52 <Webster> Latest update from devactivity: FISH - Revision 229: meta <http://dev.openttdcoop.org/projects/fish/repository/revisions/229> || FISH - Revision 227: Change: updated changelog <http://dev.openttdcoop.org/projects/fish/repository/revisions/227> || FISH - Revision 228: Added tag 0.1.1 for changeset c3d27f04f01a <http://dev.openttdcoop.org/projects/fish/repository/revisions/228> || FISH - Revision 226: Change: pushed start date for current ships back to 1870...bit unrealistic, ... <http://dev.openttdcoop.org/projects/fish/repository/revisions/226> 08:06:17 *** andythenorth has joined #openttdcoop.devzone 08:07:32 *** andythenorth has quit IRC 08:29:55 *** andythenorth has joined #openttdcoop.devzone 08:42:17 *** andythenorth has quit IRC 08:42:30 *** ODM has joined #openttdcoop.devzone 08:52:15 *** Phazorx has joined #openttdcoop.devzone 08:59:52 *** andythenorth has joined #openttdcoop.devzone 09:08:04 *** andythenorth has quit IRC 09:33:51 *** Zuu has joined #openttdcoop.devzone 10:47:11 <Hirundo> argh, why did someone have to resurrect the old IS thread 10:49:47 <planetmaker> dunno :S 11:02:59 <Webster> Latest update from devactivity: Infrastructure Sharing - Feature #5: Split patch <http://dev.openttdcoop.org/issues/5#change-1872> 11:53:42 *** KenjiE20 has joined #openttdcoop.devzone 13:46:53 *** PeterT has joined #openttdcoop.devzone 14:18:00 *** PeterT has quit IRC 14:27:14 *** PeterT has joined #openttdcoop.devzone 14:42:40 *** PeterT has quit IRC 14:44:08 *** PeterT has joined #openttdcoop.devzone 14:44:57 *** Zuu has quit IRC 14:49:33 *** PeterT has quit IRC 14:49:49 *** PeterT has joined #openttdcoop.devzone 15:05:47 *** PeterT has quit IRC 15:05:57 *** PeterT has joined #openttdcoop.devzone 15:12:19 *** PeterT has quit IRC 15:12:31 *** PeterT has joined #openttdcoop.devzone 15:13:11 *** PeterT has joined #openttdcoop.devzone 15:15:01 *** PeterT has quit IRC 15:20:13 <Webster> Latest update from devactivity: Infrastructure Sharing - Revision 14538: [IS] Fix: Crash in some corner cases when clicking openi... <http://dev.openttdcoop.org/projects/is2/repository/revisions/14538> 15:22:37 *** PeterT has joined #openttdcoop.devzone 15:25:01 *** andythenorth has joined #openttdcoop.devzone 15:29:42 *** PeterT has quit IRC 15:29:57 *** PeterT has joined #openttdcoop.devzone 15:30:32 *** andythenorth has quit IRC 16:12:32 *** PeterT has quit IRC 16:47:21 *** Zuu has joined #openttdcoop.devzone 17:09:27 *** Zuu has quit IRC 18:12:15 <Webster> Latest update from devactivity: Infrastructure Sharing - Bug #697 (Closed): Dedicated server crash - segmentation fault in signal... <http://dev.openttdcoop.org/issues/697#change-1873> || Infrastructure Sharing - Revision 14558: Merge: trunk up to r18667 <http://dev.openttdcoop.org/projects/is2/repository/revisions/14558> || Infrastructure Sharing - Revision 14539: [IS] Fix: (fix #697) Assertion failure in signal.cpp bec... <http://dev.openttdcoop.org/projects/is2/repository/revisions/14539> || Infrastructure Sharing - Revision 14557: (svn r18667) -Fix [FS#3454]: [NoAI] crash when trying to... <http://dev.openttdcoop.org/projects/is2/repository/revisions/14557> || Infrastructure Sharing - Revision 14556: (svn r18666) -Codechange: Add tooltips to enable/disable... <http://dev.openttdcoop.org/projects/is2/repository/revisions/14556> || Infrastructure Sharing - Revision 14555: (svn r18665) -Feature [FS#567]: Allow contour-map to be ... <http://dev.openttdcoop.org/projects/is2/repository/revisions/14555> || Infrastructure Sharing - Revision 14554: (svn r18664) -Fix [FS#3449]: Unshade shaded finances win... <http://dev.openttdcoop.org/projects/is2/repository/revisions/14554> || Infrastructure Sharing - Revision 14553: (svn r18663) -Codechange (r1): Remove unused _smallmap_v... <http://dev.openttdcoop.org/projects/is2/repository/revisions/14553> || Infrastructure Sharing - Revision 14552: (svn r18662) -Feature: Add WarpIN-based installer for OS/2 <http://dev.openttdcoop.org/projects/is2/repository/revisions/14552> 18:28:37 *** welshdragon has joined #openttdcoop.devzone 19:27:40 <Hirundo> IS is ready for a 2.1.1 bugfix release, fixing the bugs in trunk and IS 19:28:25 <Hirundo> Rubidium: Could you trigger an IS compile tonight? 19:30:50 *** xpdt has joined #openttdcoop.devzone 19:32:25 <Webster> Latest update from devactivity: Infrastructure Sharing - Revision 14560: [IS] Prepare release of IS2.1.1 <http://dev.openttdcoop.org/projects/is2/repository/revisions/14560> || Infrastructure Sharing - Revision 14559: [IS] Revert: changes for version 2.1. <http://dev.openttdcoop.org/projects/is2/repository/revisions/14559> 19:34:23 <Hirundo> Ammler/planetmaker: could you try to get IS recompiled tonight? ;) I have to leave now 19:35:38 <planetmaker> enjoy. I'll try to see to it. Though I try to get the newgrf gui up to trunk (again) 19:39:31 <Hirundo> OK, thanks, goodnight 19:40:02 *** xpdt has left #openttdcoop.devzone 20:25:26 <Rubidium> so... it should be triggered? 20:26:06 <Ammler> Rubidium: would be very nice, as the 2.1 has big bugs, afaik. :-) 20:26:30 <Rubidium> just a bunch of asserts that trigger quite easily 20:26:44 <Ammler> tip is ready for 2.1.1 20:27:26 <Rubidium> [2009-12-30 20:26:59] Task 0002239 created (hg://mz.openttdcoop.org/hg/is2, IS2.1.1) 20:28:37 <Ammler> Rubidium: could you check if SSH still works 20:29:33 <Rubidium> after kicking the RSA fingerprint it does 21:01:23 *** Mark has quit IRC 21:18:52 <Ammler> Rubidium: thanks, compile seems done. 21:19:02 <planetmaker> \o/ 21:39:25 *** andythenorth has joined #openttdcoop.devzone 21:45:40 <andythenorth> hai hai 21:46:27 <Ammler> planetmaker: something got wrong with is2 21:46:34 <Ammler> there is no .hgtags anymore 21:46:55 <andythenorth> that's interesting 21:46:57 <planetmaker> hm, no? 21:47:04 <andythenorth> I had trouble committing FISH this morning 21:47:16 <planetmaker> commit now, andythenorth :-) 21:47:24 <andythenorth> (I did already) 21:47:25 <andythenorth> hg said there were conflicts 21:47:31 <andythenorth> with .hgtags... 21:47:35 <planetmaker> uh 21:47:41 <planetmaker> well. solve them ;-) 21:49:13 <Ammler> hmm, and Hirundo patched both columns, first and 4th 21:49:16 <andythenorth> Actually I had trouble pushing, not committing 21:49:39 <andythenorth> or both, I'm just reading my terminal log 21:49:43 <andythenorth> anyway, fixed it 21:50:38 <andythenorth> I'll spare you the details :) 21:51:58 <Ammler> I hate current server 21:52:29 * Ammler needs to read the logs about the talk pm had about root server 21:52:49 <planetmaker> ah. 21:53:23 <planetmaker> basically I proposed to rent out parts of this server for interested people as OpenTTD server - and go for a root server 21:54:31 <Ammler> you really think, there are people around, who would pay for openttd hosting? 21:56:32 <andythenorth> Ammler: I dunno, but I'll contribute to current / new server costs for repo etc 21:58:07 <Ammler> http://www.hetzner.de/de/hosting/produkte_rootserver/eq4/ <-- the root server I have in mind 21:58:09 <Webster> Title: Hetzner Online AG: Root Server EQ 4 (at www.hetzner.de) 21:58:29 <Ammler> http://www.hetzner.de/en/hosting/produkte_rootserver/eq4/ <-- for andythenorth :-) 21:58:30 <Webster> Title: Hetzner Online AG: Dedicated Server EQ 4 (at www.hetzner.de) 21:59:04 *** Phazorx has left #openttdcoop.devzone 22:01:03 <Rubidium> that doesn't look expensive 22:02:46 <Ammler> Rubidium: how do you virtualize your servers? 22:02:46 <Rubidium> hmm.. method of payment: optional <- lol 22:02:50 <Ammler> with xen? 22:02:58 <Rubidium> vserver 22:03:05 <Rubidium> and virtualbox for the compile farm 22:03:21 <Ammler> yeah, that I know 22:05:35 <Rubidium> hmm, do they have IPv6 22:06:43 <Ammler> search for ipv6 was empty 22:08:31 <Rubidium> oh, nasty 'unlimited bandwidth' rules 22:09:13 <planetmaker> yes, 2TB basically 22:10:11 <Ammler> well, also 2TB are quite enough for us 22:10:24 <Ammler> as we use around 200GB :-) 22:10:51 <Ammler> but that just because I did a lot torrents ;-) 22:11:31 <Rubidium> 1.25 MB/s * 86400 seconds a day * 31 days = ~3 TB/month 22:12:04 <planetmaker> what calculation is that, Rubidium ? 22:12:18 <Ammler> I guess, openttd traffic 22:12:27 <Rubidium> the if over 2GB/month go back to 10 Mbps -> how much bandwidth is that? 22:12:37 <Ammler> ah 22:12:56 <planetmaker> ah 22:13:21 <Rubidium> which means 100 GB/day which means that last week there were a few days that our server had more traffic than that 22:14:41 <Ammler> I think, it is a nice feature to drop the bandwith 22:14:58 <planetmaker> well... depends :-) But then, you can pay them to not do it. 22:15:00 <Ammler> if you need more, you can buy more 22:15:01 <Rubidium> although you're royally screwed when you pay 30 euros extra for 2TB/month extra and you have 4.1 TB/month one month 22:15:22 <Rubidium> then you're put back to 10Mbps and only have 3TB/month 22:17:12 <planetmaker> well. It says, they cut it down to 10MBit and will put it back for another TB for 15€ 22:17:27 <planetmaker> sounds like you can always buy another as one-time charges 22:19:11 <planetmaker> neverthelss 15€ / TB is expensive in my eyes 22:22:56 <Ammler> well, in our case, it doesn't matter 22:27:19 <planetmaker> indeed 22:31:58 <andythenorth> planetmaker: did you get chance to look at the FIRS parameter issue? 22:32:11 <andythenorth> (nvm if you were busy) 22:32:16 <planetmaker> not yet 22:32:30 <Ammler> what's your issue? 22:32:50 <planetmaker> understanding foobar's other-newgrf-detection method 22:33:07 <andythenorth> FIRS build is now incompatible with NARS :D 22:33:16 <andythenorth> for once the bugs are not due to me 22:33:21 <andythenorth> :P 22:33:28 <planetmaker> :-P 22:33:54 *** planetmaker is now known as bugmaker 22:34:07 <bugmaker> better? ;-) 22:34:08 <andythenorth> hmm...bed time. Working on the game tomorrow? 22:34:25 <bugmaker> hm... I doubt it... Going to visit my sister 22:34:44 *** bugmaker is now known as planetmaker 22:34:57 <andythenorth> okey dokey 22:35:19 <planetmaker> good night :-) 22:35:23 <andythenorth> good night 22:35:24 *** andythenorth has left #openttdcoop.devzone 22:36:01 <Ammler> http://mz.openttdcoop.org/hg/is2/tags 22:36:13 <Ammler> no IS2.1 and IS2.1.1 22:36:35 <planetmaker> so... who removed it? 22:37:00 <Rubidium> probably nobody added it 22:37:22 <planetmaker> well, then bad bad who made a releases w/o tag 22:37:28 <Ammler> but where are the tags saved? 22:37:32 <Ammler> there is no .hgtags 22:37:35 <planetmaker> though it's honestly not that important 22:38:03 <planetmaker> tags are saved in .hgtags 22:38:13 <Ammler> [23:36] <Ammler> there is no .hgtags 22:38:27 <planetmaker> yes, I read that ;-) 22:39:02 <Ammler> I liked to tag it :-) 22:39:50 <Ammler> if I run "hg tag", it creates a file with one entry 22:39:57 <Ammler> so where are the others? 22:40:19 <planetmaker> let me look 22:42:39 <planetmaker> hm... is it only me or are there more than one head in the repo? 22:43:03 <Ammler> ah 22:43:04 <Ammler> indeed 22:43:42 <planetmaker> doesn't change the issue with tags, though 22:44:57 <Ammler> Hirundo: made that intendend, no idea why 22:45:07 <planetmaker> looks like, yes 22:45:27 <Ammler> ah 22:45:36 <Ammler> it is somehow the old version 22:45:46 <planetmaker> what 'it'? 22:45:46 <Ammler> that is ugly, imo 22:46:28 <Ammler> http://mz.openttdcoop.org/hg/is2/graph/63dfe393c601 22:46:55 <Ammler> specially r14520 22:47:37 <planetmaker> oh, I didn't know that view :-) Nice 22:48:00 <Ammler> that is the reason, I kept it 22:48:07 <Ammler> everything else has redmine too 22:49:01 <Ammler> do you tag or shall I? 22:49:32 <Ammler> if you do, tag also 2.1 22:50:20 <planetmaker> I don't think it's really the old version. 22:50:28 <planetmaker> you go :-) 22:53:08 <Ammler> Rubidium: http://obs.openttdcoop.org/specs/openttd/desktop-fix.diff <-- also worth for trunk, skidd confirmed 22:53:45 <Ammler> planetmaker: he changed to the patch queue 22:54:13 <Ammler> then he stopped development on old branch and commited his patch queue 22:54:39 <planetmaker> yes. But he did that with 2.1 already. And we discussed that 22:54:56 <Ammler> yes 22:55:21 <planetmaker> in this channel :-) So obviously he uses (now) a patch queue in order to split it up. What's bad about it? 22:55:33 <Ammler> that ugly part is there since then 22:55:39 <planetmaker> ? 22:55:46 <planetmaker> which ugly part? 22:56:12 <Ammler> ok, not ugly but confusing... 22:56:24 <Ammler> I dont get it 22:56:25 <planetmaker> ok, what confusing part? :-) 22:56:51 <Ammler> he develops it as patch queue, but pushes it to the default branch? 22:57:24 <planetmaker> yes. In this repo. I assume he has another repo at home 22:57:29 <Ammler> I would make one branch per patch or a patch queue repo 22:57:56 <Ammler> planetmaker: how should someone contribute now? 22:57:59 <planetmaker> besides, this repo can have several heads... and then there's still clean trunk 22:58:33 <planetmaker> Ammler: that's more difficult. But you can easily make a patch against head and it will be a nice (new) patch for his queue 22:58:45 <planetmaker> And... who contributed anyway? Not even I did... 22:59:04 <Ammler> you made trunk syncs, didn't you? 22:59:12 <planetmaker> yes. A few 22:59:24 <planetmaker> But they were of mediocre quality :-) 22:59:37 <Ammler> :-) 22:59:56 *** ODM has quit IRC 23:00:36 <Ammler> how is the revert commit command again? 23:00:44 <Ammler> backout or something 23:01:23 <planetmaker> rollback 23:01:25 <planetmaker> if it's the last 23:01:33 <Ammler> it isn't 23:01:35 <planetmaker> backout otherwise... but I'd not use it 23:01:44 <Ammler> and you don't like rollback anyway ;-) 23:01:54 <planetmaker> oh, I use them. Locally 23:01:56 <Ammler> yes, backout needs merge 23:02:07 <planetmaker> But I consider it on public repos back practise 23:02:25 <Ammler> I need to revere the release changeset 23:02:42 <planetmaker> hm, why? 23:02:48 <planetmaker> well. yes. 23:02:56 <planetmaker> Just make a diff and apply it reversed 23:03:22 <planetmaker> hg diff -rXX:YY > make_release.diff 23:03:35 <planetmaker> patch -p1 -r < make_release.diff 23:04:00 <Ammler> or hg backout --merge ? 23:04:19 <planetmaker> that's two commits 23:05:00 <planetmaker> (not that it hurts, whatever you prefer) 23:05:10 <planetmaker> And I should go to bed :-) 23:07:25 <planetmaker> http://pastebin.ca/1732393 diff :-P 23:08:36 <Ammler> planetmaker: btw, instead using -rxx:yy, you -c 23:08:41 <Ammler> use* 23:09:40 <planetmaker> true 23:09:48 <planetmaker> forgot about that 23:10:58 <Ammler> and hg import 23:11:49 <Webster> Latest update from devactivity: Infrastructure Sharing - Revision 14561: Added tag 2.1.1 for changeset ba6cda83f9a0 <http://dev.openttdcoop.org/projects/is2/repository/revisions/14561> 23:17:51 <Ammler> planetmaker: good night :-) 23:18:08 <Ammler> btw. do you know something about rebase? 23:18:23 <planetmaker> well... I know it exists. 23:18:57 <planetmaker> it's intended for cases where you want to move a commit further up in the tree. Good for patches 23:19:07 <planetmaker> I think mq uses it 23:19:25 <planetmaker> but... would need to check to be sure 23:19:58 <Ammler> that is what #mercurial suggested to use for reverting a changelog 23:20:05 <Ammler> set* 23:20:10 <planetmaker> ah 23:20:37 <planetmaker> which network is that on? 23:20:49 <Ammler> irc.freenode.net 23:21:02 <Ammler> like everything else :-) 23:24:06 <planetmaker> ok :-) But now... good night :-)