Times are UTC Toggle Colours
00:43:36 *** Frankr has quit IRC 00:59:13 *** KenjiE20|LT has joined #openttdcoop.devzone 00:59:18 *** KenjiE20 has quit IRC 01:58:36 <PeterT> devzone is down! 01:58:38 <PeterT> :-( 01:58:41 <PeterT> I can't download IS2.1.1 02:10:01 *** PeterT has quit IRC 03:22:58 *** KenjiE20|LT has quit IRC 03:37:50 *** Hirundo has quit IRC 03:37:50 *** Ammler has quit IRC 03:40:32 *** Hirundo has joined #openttdcoop.devzone 03:40:38 *** Ammler has joined #openttdcoop.devzone 04:07:02 *** welshdragon has quit IRC 07:47:39 *** andythenorth has joined #openttdcoop.devzone 07:55:44 *** andythenorth has quit IRC 07:59:40 *** andythenorth has joined #openttdcoop.devzone 08:01:31 *** Madis has joined #openttdcoop.devzone 08:09:55 *** Madis has quit IRC 08:11:44 *** andythenorth has quit IRC 08:14:31 *** andythenorth has joined #openttdcoop.devzone 08:18:00 *** andythenorth has quit IRC 08:34:31 *** andythenorth has joined #openttdcoop.devzone 09:02:28 *** andythenorth has quit IRC 09:05:05 *** andythenorth has joined #openttdcoop.devzone 09:33:09 *** andythenorth has quit IRC 09:35:42 *** andythenorth has joined #openttdcoop.devzone 09:49:44 *** andythenorth has quit IRC 09:52:19 *** andythenorth has joined #openttdcoop.devzone 11:21:39 <Hirundo> Can I create a new repository 'is2-patches' on redmine? 11:35:18 <Hirundo> planetmaker? 11:35:31 <planetmaker> of course 11:36:00 <Hirundo> I guess a repository is all we need, no need for more issue trackers etc 11:36:15 <planetmaker> hm, yes 11:36:49 <planetmaker> though... then the commits etc. are not linked. So, just disable all issue-trackers etc in that project and link it to the old one 11:37:35 <Hirundo> Well, if we copy each commit to the other repo, including its message, that should still work fine 11:38:24 <planetmaker> yup 11:39:34 <Hirundo> SCM dir should be /home/ottdc/hg-repos/is2-patches/, right? 11:39:55 <planetmaker> if you like to call it that way: yes 11:40:14 <Hirundo> Do I need to create that directory first, or does redmine do that automatically? 11:40:35 <planetmaker> redmine doesn't create it. 11:40:58 <planetmaker> do you have ssh access? 11:41:04 <planetmaker> otherwise I can quickly create it 11:41:38 <planetmaker> well. Done. Had a session anyway 11:41:43 <Hirundo> thanks 11:42:53 <planetmaker> you should now be able to clone yours to that remote dir 11:43:07 <Hirundo> Yes, will do that later this afternoon 11:48:35 <Ammler> I wouldn't make a new project 11:50:08 <Ammler> Hirundo: do you have the script ready for the server hook? 12:05:47 *** welshdragon has joined #openttdcoop.devzone 12:53:53 *** KenjiE20 has joined #openttdcoop.devzone 13:22:19 <Hirundo> I'm thinking about how to do those trunk merges 13:23:53 <Ammler> Hirundo: will you merge those all at once or one branch per patch? 13:24:32 <Hirundo> All at once 13:24:52 <Hirundo> The sheer number of required merges was, for me, a reason not to use branches :) 13:27:18 <Ammler> well, because you solved the conflicts of the patches when you commit them, it should be easy to apply those 13:27:34 <Ammler> what is your issue? 13:29:00 <Ammler> we can symlink .hg/patches to is2-patches repo and use the mercurial tools to pop and apply patches 13:34:26 <Hirundo> I'll write down what I had in mind, one sec 13:39:58 <Hirundo> http://paste.openttd.org/220816 13:42:07 <Ammler> why revert? 13:42:48 <Hirundo> first revert to svn rev, then reapply all patches 13:44:05 <Ammler> shouldn't that be done automatically by pop the series? 13:44:36 <Ammler> hmm, I actually never worked with patch queue, just read the hgbook about :-) 13:45:18 * Hirundo thinks 13:46:59 <Ammler> what does qapply? 13:47:42 <Ammler> qpush I meant 13:48:16 <Ammler> so you qpop the patches, update the repo 13:48:42 <Ammler> update the patch queue to your modified and pushed patches 13:48:53 <Ammler> and qpush the patches again 13:52:09 <Ammler> Hirundo: your patch queue repo isn't on the server yet? 13:52:16 <Ammler> http://mz.openttdcoop.org/hg 13:54:58 <Ammler> hg qpush --all 13:54:59 <Ammler> hg pull -r`cat .hg/patches/.trunk.rev` -u 13:55:01 <Ammler> hg qpop --all 13:55:11 <Ammler> qpush<->qpop 14:02:25 <Hirundo> Point is that I want the main repo to be under revision control too 14:04:54 *** welshdragon has quit IRC 14:05:21 *** welshdragon has joined #openttdcoop.devzone 14:40:19 <Hirundo> Ammler: http://paste.openttd.org/220818 14:44:48 <Ammler> Hirundo: how does that work, if you push more than one changeset? 14:45:27 <Hirundo> hg incoming hook is triggered after every changeset 14:45:41 <Hirundo> unlike the changegroup hook 14:45:43 <Ammler> hmm 14:45:49 <Ammler> ok :-) 14:47:27 <Hirundo> Is what I wrote translatable to a shell script? 14:48:54 <Ammler> ah, it isn't already? 14:50:09 <Ammler> $rev = `cat ../is2-patches/.trunk.rev` --> REV = `cat ../is2-patches/.trunk.rev` 14:50:21 <Ammler> I would use UPCASE for shell vars 14:50:55 <Ammler> and if you initialize it, you don't prefix with $ 14:55:18 <Hirundo> whatever 14:55:48 <Ammler> well, but I guess, I can transform that to a bash script 14:56:06 <Ammler> theoretically, it could also be a python script :-) 14:56:34 <Ammler> but then, I need a working version from you, as I have no idea about that. 14:57:46 <Hirundo> Current version will fail, btw, since the repository contains multiple heads 14:58:14 <Hirundo> I could write this in python, though, which has the advantage that I can test locally 14:58:31 <Ammler> well, isn't the current repo a bit broken? 14:58:39 <Ammler> shouldn't we just make a new repo? 14:59:01 <Hirundo> I'd like to preserve it as a means to record the history 14:59:14 <Ammler> well, I didn't say trash it 14:59:29 <Ammler> just archive it :-) 14:59:43 <Ammler> maybe start with is3 ;-) 14:59:47 <Hirundo> I could merge the current heads with svn, so there's just one head remaining 15:02:18 <Ammler> heads counter, I would do like this: hg heads --template="{node}\n" | wc -l 15:02:46 <Hirundo> what does wc do? 15:03:05 <Hirundo> wordcount? 15:03:20 <Ammler> http://pastebin.ca/1735076 15:12:03 <Hirundo> how does wc handle a trailing newline? 15:12:47 <planetmaker> not a word 15:13:00 <planetmaker> but let's test 15:13:18 <Ammler> Hirundo: why does it matter? 15:14:16 <Hirundo> because hash1\nhash2\n has 3 lines, with the last being empty 15:14:43 <Ammler> marcel@inspiron:~/hg/is2> hg heads --template="{node}\n" | wc -l 15:14:45 <Ammler> 2 15:14:48 <planetmaker> wc -w $file 15:14:58 <planetmaker> returns only word count, empty lines are no words here 15:16:54 *** PeterT has joined #openttdcoop.devzone 15:17:50 *** PeterT has quit IRC 15:23:48 <planetmaker> andythenorth: what does your xterm tell you, if you try to execute m4? 15:24:07 <planetmaker> e.g. do you have that installed? 15:27:05 <andythenorth> I can man m4 15:27:41 <andythenorth> 'm4' does nothing, but no error either 15:28:53 <Webster> Latest update from devactivity: Infrastructure Sharing - Revision 14567: [IS] Change: Make head of 2.1 a closed branch. <http://dev.openttdcoop.org/projects/is2/repository/revisions/14567> 15:31:03 <Ammler> andythenorth: m4 --version 15:32:33 <andythenorth> GNU M4 1.4.6 15:34:54 <Ammler> so you have a working m4 :-) 15:38:21 <planetmaker> ok, thanks :-) 15:39:13 <planetmaker> I was just curious for reasons of nfo templates / macros etc. I don't want to consider something which will make it complicated for others - like you ;-) 15:39:32 <planetmaker> e.g. nothing new to install for you, so it *could* be used 15:40:09 <planetmaker> Now I need to know whether DJN has it, too :-) 15:44:08 <Webster> Latest update from devactivity: Infrastructure Sharing patches - Revision 0: Initial checkin of version 2.1.1 into the repository. <http://dev.openttdcoop.org/projects/is2-patches/repository/revisions/0> 15:44:26 <Ammler> didn't yorick once suggest it so mingw should have it too 15:46:00 <Ammler> why a new project? 15:46:06 <Ammler> Hirundo: ^ 15:46:53 <Hirundo> basically to make the patch repo publicly available / viewable 15:48:49 <planetmaker> Ammler: yes, I *think* so, but I'm not sure and I'd like to ask him :-) 15:49:43 <Ammler> Hirundo: yes, but just for the repo, you don't need a project imo. 15:50:11 <Ammler> just add a Link to the repo on the overview 15:50:22 <Hirundo> hmm... 15:50:29 <Ammler> up2you 15:50:44 <Ammler> but isn't it enough to have one repo public, mainly? 16:48:51 *** welshdragon has quit IRC 16:49:03 *** welshdragon has joined #openttdcoop.devzone 17:05:27 *** welshdragon has quit IRC 17:05:52 *** welshdragon has joined #openttdcoop.devzone 17:56:42 *** Ammler has quit IRC 17:56:44 *** Hirundo has quit IRC 18:00:31 *** Hirundo has joined #openttdcoop.devzone 18:00:37 *** Ammler has joined #openttdcoop.devzone 18:09:18 <Ammler> hmm, £600 for tt-forums? 18:12:38 <Webster> Latest update from devactivity: FIRS Industry Replacement Set - Revision 413: Feature: one more layout for the Fishing Harbour <http://dev.openttdcoop.org/projects/firs/repository/revisions/413> || FIRS Industry Replacement Set - Revision 412: Change: Fishing Harbour modified boat lift sprites,... <http://dev.openttdcoop.org/projects/firs/repository/revisions/412> || FIRS Industry Replacement Set - Revision 411: Change: Fishing Harbour shed tiles now slope aware <http://dev.openttdcoop.org/projects/firs/repository/revisions/411> || FIRS Industry Replacement Set - Revision 410: Change: Fishing Harbour empty tile slope aware <http://dev.openttdcoop.org/projects/firs/repository/revisions/410> || FIRS Industry Replacement Set - Revision 409: Change: improved layouts for Fishing Harbour <http://dev.openttdcoop.org/projects/firs/repository/revisions/409> || FIRS Industry Replacement Set - Revision 408: Change: improved layouts for Fishing Harbour <http://dev.openttdcoop.org/projects/firs/repository/revisions/408> || FIRS Industry Replacement Set - Revision 407: Change: improved layouts for Fishing Harbour <http://dev.openttdcoop.org/projects/firs/repository/revisions/407> || FIRS Industry Replacement Set - Revision 406: Change: Fishing Harbour significantly restructuring... <http://dev.openttdcoop.org/projects/firs/repository/revisions/406> || FIRS Industry Replacement Set - Revision 405: Change: Fishing Harbour significantly restructuring... <http://dev.openttdcoop.org/projects/firs/repository/revisions/405> || FIRS Industry Replacement Set - Revision 404: Change: Fishing Harbour significantly restructuring... <http://dev.openttdcoop.org/projects/firs/repository/revisions/404> 18:12:59 <Rubidium> yeah, petert with his stupid binaries 18:23:19 *** Madis has joined #openttdcoop.devzone 18:28:00 <andythenorth> planetmaker: hai hai 18:29:25 <Ammler> Hirundo: you forgot the trunk.rev in the patch queue 19:09:11 <Hirundo> Forget is a big word, I didn't want to include anything until the system is in place 19:19:00 <Ammler> how do I clone the patch queue 19:19:25 <Hirundo> hg clone the patch repo to your local .hg/patches 19:19:58 <Ammler> hg qclone ssh://ottdc@openttdcoop.org/hg-repos/is2-patches 19:20:18 *** ODM has joined #openttdcoop.devzone 19:20:25 <Ammler> you based the patch queue on openttd trunk? 19:39:50 *** Madis has quit IRC 19:44:31 <Hirundo> yes 19:44:53 <Hirundo> r18649 19:46:54 <andythenorth> no errors when making FIRS :) 20:03:12 <Webster> Latest update from devactivity: FIRS Industry Replacement Set - Revision 415: Change: found and fixed all errors / warnings due t... <http://dev.openttdcoop.org/projects/firs/repository/revisions/415> || FIRS Industry Replacement Set - Revision 414: Add: nfo for Fish Processor <http://dev.openttdcoop.org/projects/firs/repository/revisions/414> 20:13:30 <Ammler> Hirundo: are you sure, your patch queue is valid? 20:13:35 <Ammler> why do you ignore some files? 21:35:36 <Webster> Latest update from devactivity: FIRS Industry Replacement Set - Feature #461: Fish Processor <http://dev.openttdcoop.org/issues/461#change-1877> || FIRS Industry Replacement Set - Revision 415: Change: found and fixed all errors / warnings due t... <http://dev.openttdcoop.org/projects/firs/repository/revisions/415> || FIRS Industry Replacement Set - Revision 414: Add: nfo for Fish Processor <http://dev.openttdcoop.org/projects/firs/repository/revisions/414> || FIRS Industry Replacement Set - Revision 413: Feature: one more layout for the Fishing Harbour <http://dev.openttdcoop.org/projects/firs/repository/revisions/413> || FIRS Industry Replacement Set - Revision 412: Change: Fishing Harbour modified boat lift sprites,... <http://dev.openttdcoop.org/projects/firs/repository/revisions/412> || FIRS Industry Replacement Set - Revision 411: Change: Fishing Harbour shed tiles now slope aware <http://dev.openttdcoop.org/projects/firs/repository/revisions/411> || FIRS Industry Replacement Set - Revision 410: Change: Fishing Harbour empty tile slope aware <http://dev.openttdcoop.org/projects/firs/repository/revisions/410> || FIRS Industry Replacement Set - Revision 409: Change: improved layouts for Fishing Harbour <http://dev.openttdcoop.org/projects/firs/repository/revisions/409> || FIRS Industry Replacement Set - Revision 408: Change: improved layouts for Fishing Harbour <http://dev.openttdcoop.org/projects/firs/repository/revisions/408> || FIRS Industry Replacement Set - Revision 407: Change: improved layouts for Fishing Harbour <http://dev.openttdcoop.org/projects/firs/repository/revisions/407> || Infrastructure Sharing patches - Revision 0: Initial checkin of version 2.1.1 into the repository. <http://dev.openttdcoop.org/projects/is2-patches/repository/revisions/0> || Infrastructure Sharing - Revision 14567: [IS] Change: Make head of 2.1 a closed branch. <http://dev.openttdcoop.org/projects/is2/repository/revisions/14567> || FIRS Industry Replacement Set - Revision 406: Change: Fishing Harbour significantly restructuring... <http://dev.openttdcoop.org/projects/firs/repository/revisions/406> || FIRS Industry Replacement Set - Revision 405: Change: Fishing Harbour significantly restructuring... <http://dev.openttdcoop.org/projects/firs/repository/revisions/405> || FIRS Industry Replacement Set - Revision 404: Change: Fishing Harbour significantly restructuring... <http://dev.openttdcoop.org/projects/firs/repository/revisions/404> 21:45:43 *** welshdragon has quit IRC 21:47:21 *** welshdragon has joined #openttdcoop.devzone 22:00:18 *** andythenorth has quit IRC 22:02:56 *** andythenorth has joined #openttdcoop.devzone 22:53:04 *** andythenorth has quit IRC 22:55:23 *** andythenorth has joined #openttdcoop.devzone 23:03:29 *** andythenorth has quit IRC 23:12:07 *** ODM has quit IRC 23:35:23 <Rubidium> 200 GB of OpenGFX has been downloaded via the content thingy :) 23:44:24 <planetmaker> now, not bad, given it's only 3.5MB per download or so :-) 23:44:56 <Rubidium> http://paste.openttd.org/220822 23:46:51 <Ammler> 14377 downloads from openttdcoop.org 23:46:57 <planetmaker> :-) what time span is that based on? 23:47:05 <Ammler> (0.2.1) 23:47:21 <Rubidium> planetmaker: since OpenTTD 0.1.0 :) 23:47:41 <planetmaker> oh, very short then :-) 14 days 23:47:45 <planetmaker> not quite 23:48:01 <Rubidium> it's 'all time' 23:48:14 <Rubidium> don't know when the content system went live 23:51:18 <planetmaker> @calc 200/3.5 23:51:18 <Webster> planetmaker: 57.1428571429 23:51:23 <planetmaker> wow 23:52:26 <planetmaker> and nice to see it used :-) It was worth it then :-) 23:52:33 <Rubidium> it excludes the windows installer downloads (of which there're probably no stats) 23:53:17 <planetmaker> so, even more :-) 23:53:28 <planetmaker> which might even be a non-negligible number 23:55:20 <Rubidium> yup 23:56:46 <Rubidium> any suggestions for someone to manage an 'OpenTTD title game for 1.0' election?