Times are UTC Toggle Colours
01:12:18 <V453000> I have to say these things this stuff does are pretty amazing :) I like it already 10:02:43 *** chillcore has joined #openttdcoop.devzone 10:03:24 <chillcore> Hello and good morning all. 10:04:10 <chillcore> I have two issue two report. 10:05:39 <chillcore> First, the devzone is unreachable when using firefox on windows XP, somone reported the same issue with Crome but I do not know the OS he's using. 10:06:00 <chillcore> For me, firefox on linux Mint works fine. 10:07:24 <chillcore> Second issue ... the compile farm failed to build my patchpack ... not sure what went wrong as the error logs make little sence to me. :( 10:10:03 <chillcore> Somehing about files having the wrong permissions ... does that mean files present on on my pc that I pushed or files on the CF that I have no access to? 10:13:18 <chillcore> Just mentioning ... I have changed pc since my previous commits and had to set everything up from scratch so errors on my side are very possible. 10:25:03 <planetmaker> hi chillcore 10:25:25 <planetmaker> chillcore, I can't see a reason the website should be reachable or not with a certain OS 10:25:32 <chillcore> hello planetmaker 10:25:35 <planetmaker> I can only guess that it's some funky user-side config in that case 10:25:46 <planetmaker> we don't distinguish any OS in our services 10:26:22 <chillcore> me neither, the strange thing is that the same browser works on one OS and not on the other 10:26:58 <chillcore> and is not limited to one version; firefox just updated to v18 and the problem remains 10:27:02 <chillcore> strange 10:27:06 <planetmaker> maybe some funky https anywhere extension installed? 10:27:22 <planetmaker> which rewrites URLs on the fly. It's known to cause issues with many sides 10:28:28 <planetmaker> http://bundles.openttdcoop.org/chillpp/releases/ERROR/r22555/openttd-chillpp-1.1.r22555-build.err.log tells me that your config.lib is wrong in chillpp 10:28:38 <chillcore> maybe ... I did not notice because I am using my windows setup only for playing. 10:28:55 <planetmaker> and subsequently the CF of course doesn't find the files it want to publish. 10:29:01 <planetmaker> back in ~30 minutes. Lunch 10:29:07 <chillcore> my config lib ... 10:29:12 <chillcore> bon apetit 10:55:30 <Ammler> hmm, I am not sure, mq support still works, we had some issues with mq 10:56:20 <chillcore> hello Ammler 10:57:10 <chillcore> I could push fine. I have been thinking about previous occasions where I had this problem. 10:57:18 <chillcore> possibilities are: 10:58:10 <chillcore> 1. CF patched trunk instead of r22555 (test build instead of release) 10:58:59 <chillcore> 2. I need to update my makefile.msvc again 10:59:46 <chillcore> 3. my config file is wrong ... like planetmaker suggests 10:59:56 <chillcore> 4. something else 11:00:21 <chillcore> 1, 2 and 4 have happened before ... ;) 11:02:06 <Ammler> when was last successful build? 11:02:43 <Ammler> May 2012? 11:05:00 <chillcore> the last one that I triggered myself was feb 2012. last succesfull was jun 20 2012 11:05:05 <Ammler> you still don't use vcs for developing your patchpack? 11:05:20 <chillcore> ? vcs 11:05:30 <chillcore> the MQ is versioned 11:05:32 <planetmaker> version control system 11:05:34 <Ammler> some kind of version control system 11:05:38 <planetmaker> and yes, it is 11:05:41 <chillcore> HG 11:06:07 <Ammler> so still patches mq? 11:06:20 <chillcore> Yes 11:06:47 <Ammler> was just wondering if I need to check mq support working or if we could do it ohter way 11:07:00 <Ammler> you have one big patch :-) 11:07:08 <chillcore> http://dev.openttdcoop.org/projects/chillpp/repository 11:07:27 <Ammler> that is why I was a little bit confused, looked like you prepare the patch somewhere else 11:07:43 <chillcore> Yeah ... one big nightmare that somehow refuses to die 11:08:15 <planetmaker> well. I think that doesn't matter for this problem 11:08:32 <chillcore> I did have a bit of trouble yes ... from what can you tell, Ammler? 11:08:34 <Ammler> planetmaker: I hoped, I can trash mq support 11:08:46 <Ammler> but then well, I should fix it 11:09:27 <planetmaker> Ammler, would be fine with me. It means that chillcore would need to use a normal openttd repo. And commit his patch. And merge it from time to time with whatever openttd rev he wants to update to 11:09:50 <planetmaker> thus: in principle I do agree. supporting automatic mq merges is... awkward. Better let the authors do that 11:10:03 <planetmaker> Especially as hg now has somewhat mutable history :D 11:10:49 <planetmaker> chillcore, maybe we could try it indeed that way: You use a normal openttd repo - just with all your commits added to it. 11:11:02 <planetmaker> So the CF will try to compile the head of that repo 11:11:14 <planetmaker> Which will then be exactly that version which you checked out and tested 11:11:19 <planetmaker> (and comitted) 11:11:32 <planetmaker> it would mean though, that it's not automatically updated to new openttd anymore 11:11:48 <chillcore> Sounds fine to me Planetmaker I am fine with SVN, HG or Git ... pushing is pushing 11:12:01 <planetmaker> but tbh, I'm somewhat doubtful of the sensibility of that approach anyway. Automatic updates fail in funky ways sometimes 11:12:26 <Ammler> and doesn't make big sense with the one huge patch anyway 11:12:40 <planetmaker> chillcore, so, maybe then let's try that: push your patched hg repository. Wich includes all openttd trunk commits. And all your commits 11:12:53 <planetmaker> basically a full source repo which anyone could compile 11:13:02 <planetmaker> makes it easier to understand as well :-) 11:13:16 <Ammler> and don't forget the .devzone dir bug remove the mq 11:13:22 <Ammler> but* 11:14:28 <chillcore> Also I do not see why the CF should try patching anything else but head ... since the patches are written for one revision only. 11:15:20 <Ammler> the mq support was always just experimental, it was meant to test updates automatically 11:15:32 <chillcore> so just a patched HG repo without MQ? 11:15:41 <Ammler> but still keep "a stable" rev for the openttd.org CF 11:16:29 <Ammler> it was useful for our server patch pack 11:16:35 <planetmaker> chillcore, yes, that's what we might want to try. It will make sure we only try to compile what you want us to try 11:16:56 <Ammler> where we had every single patch in the queue and saw quite soon, which patch will fail 11:17:30 <Ammler> but since nobody maintains it anymore and there was no chillpp for a long time, I invested no time anymore 11:17:44 <chillcore> IMHO that is the sensible thing to do in the case of patches. 11:18:15 <Ammler> for your case it would be useful, if you would have every patch seperated 11:18:20 <Ammler> but that way, it is silly 11:18:21 <planetmaker> maintaining patch queues is... time intensive :-) 11:18:54 <chillcore> very much, planetmaker. 11:19:04 <planetmaker> it's easier to develop on a repo and frequently merge with upstream, if all you want "just" is a patched version 11:19:28 <chillcore> Ammler, that is the plan for the next time. 11:19:39 <Ammler> but couldn't you still have one branch per patch and then merge? 11:19:56 <chillcore> I do not know how to do that in HG 11:20:11 <Ammler> do you know hot in git? 11:20:12 <chillcore> In GIT I do 11:20:21 <Ammler> why should that be different? 11:20:33 <chillcore> dunno ;) 11:20:34 <planetmaker> because it is, Ammler 11:21:00 <Ammler> planetmaker: what is different? 11:21:05 <planetmaker> I have a git repo of some other project. And I even struggle to do the equivalent of "hg pull -u" 11:21:32 <planetmaker> on a patched repo without committing my stuff 11:21:32 <chillcore> the techniques of working are different. In GIT I can not magically unmerge as with HG 11:22:01 <Ammler> git is just upper complicated 11:22:21 <Ammler> but everything should be possible with both 11:22:44 <planetmaker> anyway, also this doesn't matter. Nor is it imho sensible in chillcore's case to have a separate branch for each patch 11:22:45 <chillcore> I find GIT easier to work with for seperate branches and then merging into one tree 11:23:12 <Ammler> ok 11:23:30 <Ammler> well, the openttd.org CF does also support git repos 11:23:50 <Ammler> and we can still host the binaries 11:23:56 <Ammler> like we did for YACD 11:24:03 <Ammler> for cargodist 11:25:26 <chillcore> But HG has the advantage of this easy moving of patches ... honestly for me it is all the same as I develop in a seperate repo anyway and port the fixes over afterwards. ;) 11:25:41 <Ammler> anyway, so we don't support mq anymore, please make a "normal" repo either hg or git 11:25:55 <Ammler> where you need head to build on CF 11:26:06 <chillcore> OK ... lets do this. 11:26:09 <chillcore> r22555 11:26:13 <chillcore> please 11:27:01 <planetmaker> it's what you personally make head in your repo. i.e. what version you apply your patch(es) to 11:27:18 <Ammler> does the openttd.org CF still support your repo, maybe that needs to be asked again 11:28:10 <planetmaker> yes, better do ask TB again 11:28:21 <Ammler> chillcore: we do not care what rev you want, just repo head (tip in hg) is what we build 11:28:40 <Ammler> oh, with we I meant openttd.org CF 11:28:42 <planetmaker> http://farm.openttd.org/allPlans.action though it says it does 11:28:45 <Ammler> devzone won't build anymore 11:29:22 <Ammler> planetmaker: can you edit the url? 11:29:27 <chillcore> I do not follow Ammler sorry? 11:29:33 <planetmaker> nope. I can't change anything there 11:29:36 <Ammler> else you need to use chillpp.mq 11:29:50 <planetmaker> but better ask TB anyway 11:30:19 <chillcore> I can push there directly? 11:30:26 <Ammler> chillcore: the devzone just "prepared" the repo with head for openttd.org cf 11:30:34 <Ammler> openttd.org cf always built head only 11:30:54 <planetmaker> and for what it's worth: fonsinchen's git repo causes space issues every few days. hg behaves much nicer in that respect. Its checkouts usually amount to more than a GByte easily. Which is... painful. And causes build failures. Why ever git bloats its repos that way 11:30:55 <Ammler> so the devzone made from repo chillpp chillpp.mq 11:31:31 * planetmaker --> coffee 11:31:43 <chillcore> HG is fine 11:35:28 <Ammler> I guess, the svn convert of openttd is broken 11:36:07 <Brot6> chillpp: compile of r22555 still failed (#4778) - http://bundles.openttdcoop.org/chillpp/releases/ERROR/r22555 11:38:58 <Ammler> no 12:04:30 <chillcore> I have patched HG in one commit without mq. It is compiling at the moment to check for errors. 12:06:38 <chillcore> Now to set up the devzone folder, it used to be in the patches folder. Do I set it up in the .hg folder or somewhere else? 12:08:33 <chillcore> as for the hgrc ... I now modify the one in .hg instead of in .hg/patches, right? pushlocation is the same as before? 12:09:22 <chillcore> sorry for the delay. doing it from scratch once more. 12:11:30 <Ammler> chillcore: in root 12:11:49 <Ammler> $REPO/.devzone 12:12:02 <Ammler> but you can also skip it 12:12:32 <Ammler> openttd.org CF doesn't need it and building on devzone is not really needed anymore 12:12:56 <Ammler> how do you push? 12:13:10 <chillcore> ah ok so no .devzone then 12:14:54 <chillcore> untill now: from the console "hg push --mq" to (hgrc) https://push.openttdcoop.org/chillpp 12:15:07 <michi_cc> chillcore: Do these Firefox users happen to use HTTPS Everywhere? It ships with rules that were broken for openttd.org and are likely broken for ottdcoop (https://gitweb.torproject.org/https-everywhere.git/blob/HEAD:/src/chrome/content/rules/OpenTTD.xml) 12:15:08 <Webster> Title: gitweb.torproject.org" target="_blank">gitweb.torproject.org Git - https-everywhere.git/blob - src/chrome/content/rules/OpenTTD.xml (at gitweb.torproject.org" target="_blank">gitweb.torproject.org) 12:17:03 <chillcore> I will have to check when I am back in my windows environment michi_cc. 12:17:40 <michi_cc> Yeah, fits together with Windows XP. All subdomains point to the same IP and Windows XP doesn't support SSL Server Name Indication which means everybody lands on whatever the first configured site for httpd is. 12:20:16 <chillcore> I see, well I myself am not too much affected by the issue ... hope it gets solved soon 12:20:37 <chillcore> Thank you for the info 12:23:09 <Ammler> michi_cc: but that is some very old xp, recent xp has no issue with sni, has it? 12:24:30 <michi_cc> No Windows XP supports it, but I see that Firefox might provide it's own SSL libraries, so it might support it even on XP. 12:24:43 <Ammler> hmm, I need to start my xp vm then 12:25:27 <Ammler> we kinde expect working sni 12:25:37 <Ammler> not like openttd.org which redirects to secure.o.o 12:25:59 <michi_cc> No idea how accurate that is: http://en.wikipedia.org/wiki/Server_Name_Indication#No_support 12:26:00 <Webster> Title: Server Name Indication - Wikipedia, the free encyclopedia (at en.wikipedia.org) 12:26:15 <Ammler> in my xp, sni works just fine 12:26:52 <Ammler> I am sure, we would get guite much more complains if that wouldn't be the case 12:27:29 <michi_cc> I guess you don't have many IE users then :) 12:27:55 <Ammler> it works also with IE 12:29:06 <Ammler> planetmaker: since I have a win xp box running, what was the issue yesterday I wanted to test? 12:29:34 <Ammler> michi_cc: I could imagine, it is xp without any sp 12:30:18 <Ammler> IE6 or earlier 12:30:22 <Ammler> I have IE8 12:34:45 <michi_cc> Wikipedia disagrees, but, hey, it's wikipedia :p 12:34:53 <Ammler> michi_cc: I guess the issue is just with validating the cert, that might be because we use wildcard cert 12:35:28 <Ammler> no clue 12:36:37 <Ammler> yep, confirmed my https://private.gmuer.org doesn't work on xp 12:36:52 <Ammler> oh 12:36:54 <Ammler> no 12:37:01 <Ammler> the cert is outdated anyway :-P 13:08:01 <chillcore> so ... where do I push? I tried just now to the old location and got a repository is unrelated error, which it is. 13:09:19 <chillcore> feel free to nuke the old repo as I have a backup (well not of all the produced binaries) 13:09:22 <Ammler> if we can't change openttd.org CF settings, you should push to chillpp.mq 13:10:31 <Ammler> I will strip it 13:10:43 <chillcore> can I already try that now or should I wait? not that I am impatient or anything 13:10:45 <chillcore> ok 13:11:33 <Ammler> stripping is in process 13:11:38 <Ammler> done 13:11:42 <Ammler> push 13:11:53 <chillcore> thank you ... trying now 13:11:56 <Ammler> hmm, do you push via https? 13:12:03 <Ammler> or ssh 13:12:12 <chillcore> https 13:12:23 <Ammler> then I might need to adjust permissions :-) 13:12:54 <chillcore> hmm ok let me finish the attempt in progress then 13:13:05 <chillcore> i'll enter the wron password 13:13:10 <chillcore> +g 13:13:25 <chillcore> disconnected 13:16:57 <Ammler> majonaise 13:17:03 <Brot6> feed mqs had 14 updates, showing the latest 10 13:17:03 <Brot6> Chill's PatchPack - Revision 60:70cba50fcfda (mq): Fix: Compiler warnings coming from the "Command a... XchillcoreX @ http://dev.openttdcoop.org/projects/chillpp/repository/mq/revisions/70cba50fcfda 13:17:03 <Brot6> Chill's PatchPack - Revision 61:e8e96b0c9cc5 (mq): Fix: Compiler warnings coming from the copypaste ... XchillcoreX @ http://dev.openttdcoop.org/projects/chillpp/repository/mq/revisions/e8e96b0c9cc5 13:17:03 <Brot6> Chill's PatchPack - Revision 62:9db544e01dba (mq): Fix: Compiler warning coming from the departues b... XchillcoreX @ http://dev.openttdcoop.org/projects/chillpp/repository/mq/revisions/9db544e01dba 13:17:07 <Brot6> Chill's PatchPack - Revision 63:2728a56d802f (mq): Fix: Compiler warning coming from the programmabl... XchillcoreX @ http://dev.openttdcoop.org/projects/chillpp/repository/mq/revisions/2728a56d802f 13:17:11 <Brot6> Chill's PatchPack - Revision 64:69ce5730417a (mq): Fix: Compiler warnings coming from the moreheight... XchillcoreX @ http://dev.openttdcoop.org/projects/chillpp/repository/mq/revisions/69ce5730417a 13:17:15 <Brot6> Chill's PatchPack - Revision 65:ae2e67a4f388 (mq): Fix: Compiler warning coming from the watch gui p... XchillcoreX @ http://dev.openttdcoop.org/projects/chillpp/repository/mq/revisions/ae2e67a4f388 13:17:19 <Brot6> Chill's PatchPack - Revision 66:fa547cecbff6 (mq): Added tag r22555 for changeset ae2e67a4f388 XchillcoreX @ http://dev.openttdcoop.org/projects/chillpp/repository/mq/revisions/fa547cecbff6 13:17:23 <Brot6> Chill's PatchPack - Revision 67:02cb9f911401 (mq): Update: changelog XchillcoreX @ http://dev.openttdcoop.org/projects/chillpp/repository/mq/revisions/02cb9f911401 13:17:26 <Brot6> Chill's PatchPack - Revision 68:220fc9a5b7d9 (mq): rename complete patch correctly XchillcoreX @ http://dev.openttdcoop.org/projects/chillpp/repository/mq/revisions/220fc9a5b7d9 13:17:32 <Brot6> Chill's PatchPack - Revision 69:f7c1804f235e (mq): Added tag r22555 for changeset 220fc9a5b7d9 XchillcoreX @ http://dev.openttdcoop.org/projects/chillpp/repository/mq/revisions/f7c1804f235e 13:17:36 <Brot6> feed mqs had 14 updates, showing the latest 10 13:17:38 <Brot6> Chill's PatchPack - Revision 60:70cba50fcfda (mq): Fix: Compiler warnings coming from the "Command a... XchillcoreX @ http://dev.openttdcoop.org/projects/chillpp/repository/revisions/70cba50fcfda 13:17:42 <Brot6> Chill's PatchPack - Revision 61:e8e96b0c9cc5 (mq): Fix: Compiler warnings coming from the copypaste ... XchillcoreX @ http://dev.openttdcoop.org/projects/chillpp/repository/revisions/e8e96b0c9cc5 13:17:46 <Brot6> Chill's PatchPack - Revision 62:9db544e01dba (mq): Fix: Compiler warning coming from the departues b... XchillcoreX @ http://dev.openttdcoop.org/projects/chillpp/repository/revisions/9db544e01dba 13:17:46 <Ammler> omg 13:17:50 <Brot6> Chill's PatchPack - Revision 63:2728a56d802f (mq): Fix: Compiler warning coming from the programmabl... XchillcoreX @ http://dev.openttdcoop.org/projects/chillpp/repository/revisions/2728a56d802f 13:17:54 <Brot6> Chill's PatchPack - Revision 64:69ce5730417a (mq): Fix: Compiler warnings coming from the moreheight... XchillcoreX @ http://dev.openttdcoop.org/projects/chillpp/repository/revisions/69ce5730417a 13:17:58 <Brot6> Chill's PatchPack - Revision 65:ae2e67a4f388 (mq): Fix: Compiler warning coming from the watch gui p... XchillcoreX @ http://dev.openttdcoop.org/projects/chillpp/repository/revisions/ae2e67a4f388 13:17:59 <planetmaker> hehe 13:18:02 <Brot6> Chill's PatchPack - Revision 66:fa547cecbff6 (mq): Added tag r22555 for changeset ae2e67a4f388 XchillcoreX @ http://dev.openttdcoop.org/projects/chillpp/repository/revisions/fa547cecbff6 13:18:06 <Brot6> Chill's PatchPack - Revision 67:02cb9f911401 (mq): Update: changelog XchillcoreX @ http://dev.openttdcoop.org/projects/chillpp/repository/revisions/02cb9f911401 13:18:09 <Brot6> Chill's PatchPack - Revision 68:220fc9a5b7d9 (mq): rename complete patch correctly XchillcoreX @ http://dev.openttdcoop.org/projects/chillpp/repository/revisions/220fc9a5b7d9 13:18:13 <Brot6> Chill's PatchPack - Revision 69:f7c1804f235e (mq): Added tag r22555 for changeset 220fc9a5b7d9 XchillcoreX @ http://dev.openttdcoop.org/projects/chillpp/repository/revisions/f7c1804f235e 13:18:22 <Ammler> this multirepo feature seems just so buggy 13:18:53 <chillcore> can I has fries with that mayo please? :P 13:21:02 <Brot6> repository /home/hg/chillpp-repo registered in Redmine with url /home/hg/chillpp-repo 13:21:02 <Brot6> repository /home/hg/chillpp-repo created 13:21:19 <Ammler> hmm 13:21:28 <Ammler> I can't create a project with .mq 13:21:43 <Ammler> I need to manually adjust the db, sec 13:22:36 <Ammler> or we could simply ask TB to remove .mq from the cf settings 13:22:38 <Ammler> planetmaker: ? 13:24:54 <planetmaker> As said before: one should simply talk to TB. Then adjusting the repo to pull from is not a big issue 13:26:09 <Ammler> chillcore: the repo should work now 13:26:27 <chillcore> I'll try again 13:27:29 <Ammler> planetmaker: what issue did arise yesterday with windows? 13:27:45 <Ammler> I wanted to test but didn't have a winxp at hand 13:28:09 <planetmaker> with windows? 13:28:15 <planetmaker> I know of no windows issue 13:28:39 <chillcore> hmm still unrelated repo ... or did I forget to change to chillpp.mq? 13:28:46 <Ammler> I just remember that I didn't have windows xp to test something, maybe it was somewhere else :-) 13:28:57 <Ammler> chillcore: did you? 13:29:05 <chillcore> no I did not 13:29:15 <Ammler> chillpp.mq is empty 13:29:16 <planetmaker> chillcore, if you did not clone from devzone initially, it will remain unrelated. Force commit by hg push -f 13:30:02 <Ammler> planetmaker: this error also arises with a empty repo? 13:30:10 <chillcore> I started with a brand new checkout to avoid "polution" 13:30:47 <planetmaker> Ammler, yes, afaik 13:31:03 *** Lakie has joined #openttdcoop.devzone 13:31:32 <chillcore> still is unrelated error but it is sending now, fingers crossed 13:32:22 <chillcore> ETA: 1h01m ... coffee time 13:32:57 <chillcore> thank you once again for your never ending support. 13:33:30 <Ammler> also the compile will be done at 7.11pm if I read that right 13:33:51 <Ammler> no clue what timezone :-) 13:34:09 <chillcore> it used to be 3-4 am but whatever time is fine 13:34:23 <Ammler> 20-Jul-2012 04:01:35 Build OTTD3PT-CHILL-SRC-23 started building on agent Controller 13:34:47 <Ammler> well, you will have it tomorrow :-P 13:34:50 <chillcore> whenever the CF load is lowest suits me. ;) 13:35:55 <chillcore> so if all goes well I do not need to tag my source anymore to trigger builds neither? 13:36:11 <Ammler> no 13:36:14 <Ammler> just change head 13:36:38 <Ammler> (and push) 13:36:58 <chillcore> as in just commit on top and push (without the patches stuff) 13:37:10 <Ammler> yep 13:37:16 <chillcore> okidoki 13:37:48 <Ammler> we could still use devzone to create patches etc. 13:40:02 <chillcore> true 13:50:36 <Ammler> chillcore: https://hg.openttdcoop.org/chillpp.mq/ still empty 13:52:37 <chillcore> crap ... I missed this line: "chillpp.mq is empty" it is pushing to chilpp 13:52:41 <chillcore> oops 13:53:18 <Ammler> that might be the reason, you got unrelated repo 13:53:26 <Ammler> :-) 13:54:12 <chillcore> hehe, do I interupt and restart or let it go and hope for the best? 13:54:13 <Ammler> btw. you can have different pull and push url 13:54:51 <Ammler> so you could use http://hg.openttdcoop.org/openttd for pull and https://push.openttdcoop.org/chillpp.mq for push 13:55:08 <Ammler> and you can have other repos as alias 13:55:46 <chillcore> I remember reading something like that ... just need to find the correct syntax for in hgrc, for now default is the one I am pushing to now 13:56:00 <Ammler> default-push 13:56:14 <chillcore> that alias thingie ... how does that work? 13:56:24 <Ammler> use something else as default 13:56:32 <Ammler> then hg push whatever 13:57:06 <Ammler> you can also "hg push <url>" 13:58:42 <chillcore> If I make trunk default and my repo the default-push then it will always push to the repo right? 13:59:38 <Ammler> hg@dev:~/openttd> cat .hg/hgrc 13:59:39 <Ammler> [paths] 13:59:40 <Ammler> default = /home/hg/svn.openttd.org#default 13:59:42 <Ammler> 1.0 = /home/hg/svn.openttd.org#1.0 13:59:43 <Ammler> 1.1 = /home/hg/svn.openttd.org#1.1 13:59:45 <Ammler> 1.2 = /home/hg/svn.openttd.org#1.2 13:59:46 <Ammler> default-push = ssh://hg@bitbucket.org/OpenTTD/openttd 14:01:00 <Ammler> chillcore: yes 14:02:21 <Ammler> so you can basically just 14:02:35 <Ammler> hg pull; hg merge...; hg push; done 14:03:01 <chillcore> cool. 14:03:23 <Ammler> hehe, "just" hg merge...:-P 14:06:37 <chillcore> yeah ... its only 2350 revisions ... what could possibly go wrong? 15:00:15 <chillcore> damn connection timed out ... I tried restarting the push to see if it would continue from where it stopped but it started anew and ETA was almost 4h. so I stopped that session. 15:02:40 <chillcore> pffff .... starting over as that is the only option ... prefered is chillpp or rather chillpp.mq? 15:13:29 <chillcore> hmm 15:13:33 *** dihedral has quit IRC 15:13:42 <chillcore> pushing to https://push.openttdcoop.org/chillpp.mq abort: HTTP Error 404: Not Found 15:13:56 *** dihedral has joined #openttdcoop.devzone 15:18:08 <Ammler> chillcore: then we wait for TB to change the repo to chillpp 15:18:18 <Ammler> you could in the meantime push there 15:23:59 <chillcore> I am doing that at the moment. seems to be a bit faster than before but still 1 hour for remaining 90%. 15:24:47 <Ammler> he, is your speed that low? 15:25:24 <Ammler> if you like I can clone openttd to chillpp to make it faster for you 15:25:57 <chillcore> yeah ... 2MB for download and way less for upload. upside is no dowload limits whatsoever (besides the speed) 15:26:06 <chillcore> yes please 15:26:11 <chillcore> let me stop this 15:26:51 <Ammler> I just pull openttd 15:26:58 <Ammler> so you still have the mq there 15:27:05 <chillcore> done. indeed me clonong and just pushing the commit will be faster 15:27:14 <chillcore> do I still need the mq? 15:27:21 <Ammler> ok, pulled, now you can clone it 15:27:34 <Ammler> I could strip it, shall I? 15:27:47 <chillcore> thank you. yeah go for it 15:27:55 <chillcore> the cleaner the better 15:28:14 <chillcore> i'll pull the clean repo and patch it again 15:29:04 <Ammler> I didn't mean now :-P 15:29:50 <chillcore> if it can be done afterwards ... fine 15:30:01 <chillcore> going to clone the repo now 15:31:42 <Ammler> there isn't something like a clean repo anyway :-P 15:31:51 <Ammler> maybe you meant official, which this isn't 15:32:21 <Ammler> stripped 15:33:10 <chillcore> no I meant clean as no traces of mq's or anything that remembers of past days, just trunk 15:33:29 <Ammler> you might also like to cleanup the project description 15:33:35 <Ammler> not .mq anymore 15:33:51 <Ammler> chillcore: it's not trunk 15:33:53 <Ammler> hmm 15:33:58 <chillcore> yes I did think of that. 15:34:07 <chillcore> not trunk? 15:34:08 <Ammler> I cloned our convert 15:34:29 <Ammler> the hg.openttd.org converts are without tags 15:34:46 <Ammler> I could also pull that 15:34:56 <Ammler> what would you prefer? 15:35:00 <chillcore> I do not really understand but ok? 15:35:32 <chillcore> I think at this point a complete restart is in order? 15:35:54 <Ammler> well, I just pull also trunk too, then you can use whatever you like 15:36:23 <Ammler> http://hg.openttdcoop.org/openttd is convert of the whole svn 15:36:33 <Ammler> not just a single branch like trunk 15:36:49 <chillcore> I could post the backup mq somewhere for history (and liscence purposes) 15:36:56 <Ammler> what is the hg repo your work is based on? 15:37:09 <chillcore> I do not need all branches do I? 15:37:21 <chillcore> http://hg.openttd.org/openttd/trunk.hg 15:37:31 <Ammler> then I pull that in 15:37:46 <chillcore> "updated" to the equivalent of r22555 15:38:05 <chillcore> fine. I can work from there, no sweat 15:38:23 <Ammler> I strip our openttd convert 15:38:58 <Ammler> I used a own convert because we made the patch also for stable 15:40:36 <chillcore> complicated stuff ... CFs 15:47:13 <Ammler> hg.openttd.org is based on very early hg version, that time, there was no hgsubversion 15:49:39 <Ammler> for openttd.org CF, it does not matter 15:49:50 <Ammler> it clones the repo everytime again, afaik 15:49:59 <Ammler> and cares about tip only 15:50:24 <Ammler> that I am not sure, thought 15:50:30 <Ammler> maybe not tip but default 15:58:22 <chillcore> we will soon find out I think. can I already clone or? (please do not feel rushed; I am updating the project description and am then going to post the backup mq at tt-forums) 15:58:54 <Brot6> Chill's PatchPack - Bug #4778 (New): DevZone compile failed XcompilerX @ http://dev.openttdcoop.org/issues/4778 16:28:13 *** ODM has joined #openttdcoop.devzone 16:44:39 *** frosch123 has joined #openttdcoop.devzone 17:17:41 <Brot6> canrail: update from r39 to r41 done (8 warnings) - http://bundles.openttdcoop.org/canrail/nightlies/r41 17:19:10 <Brot6> isr: update from r18 to r20 done - http://bundles.openttdcoop.org/isr/nightlies/r20 17:55:49 <Brot6> Chill's PatchPack - Bug #4778 (New): DevZone compile failed XcompilerX @ http://dev.openttdcoop.org/issues/4778 17:56:34 <Ammler> chillcore: I somehow stripped the whole repo, sorry 17:56:38 <Ammler> but now trunk is in 17:58:47 <chillcore> the whole repo ... no biggie I posted everything I had done in there in my patchpack thread and history is saved for future generations. ;) 18:02:29 <chillcore> am I looking in the wrong direction Ammler? http://dev.openttdcoop.org/projects/chillpp has no repo and http://dev.openttdcoop.org/projects/chillpp-repo 's repository seems empty 18:03:01 <chillcore> so sorry for all this trouble and the many questions. 18:03:03 <Ammler> do you need it there? 18:03:24 <chillcore> where? 18:03:36 <Ammler> http://hg.openttdcoop.org/chillpp 18:03:46 <Ammler> at dev.o.o 18:05:00 <chillcore> anywhere is fine really. if you can paste it in the old location than I have less links to adjust (and maybe you too)? 18:05:25 <chillcore> now it seems I have two repos 18:05:46 <Ammler> I would be happy, if I don't need to do it 18:06:04 <Ammler> I see no real reason to have it there 18:06:04 <chillcore> ok. no prob for me 18:06:35 <Ammler> hmm 18:06:40 <Ammler> maybe we need 18:06:41 <chillcore> so the new repo is chillpp-repo and the old one can die? 18:06:45 <chillcore> he 18:08:11 <Brot6> repository /home/hg/chillpp registered in Redmine with url /home/hg/chillpp 18:08:11 <Brot6> repository /home/hg/chillpp created 18:09:48 <Brot6> Chill's PatchPack - Bug #4778 (New): DevZone compile failed XcompilerX @ http://dev.openttdcoop.org/issues/4778 18:10:30 <Brot6> Chill's PatchPack - Bug #4778 (Closed): DevZone compile failed XcompilerX @ http://dev.openttdcoop.org/issues/4778 18:10:30 <Brot6> Chill's PatchPack - Bug #4778 (Closed): DevZone compile failed XAmmlerX @ http://dev.openttdcoop.org/issues/4778#change-12944 18:10:40 <Ammler> no, the repo is chillpp 18:10:48 <Ammler> and now it is back in devzone, why ever :-P 18:11:04 <chillcore> I see it emerging ... 18:11:21 <Ammler> it will need some time, you do not need to wait 18:11:37 <Ammler> the repo url I pasted above is for you 18:12:13 <Ammler> that is why I disliked the ide to have it in dev.o.o 18:12:44 <Ammler> it basically copies every change into the db 18:12:55 <Ammler> but you and openttd.org CF does not need that 18:16:31 <chillcore> so as the clone location is the same as before, I still push to https://push.openttdcoop.org/chillpp. 18:16:42 <chillcore> without the dot 18:17:53 <Ammler> yep 18:19:19 <Ammler> chillcore: I also found a little bug in devzone project settings 18:19:30 <chillcore> cool, i'll just wait for the complete source to be in the repo then before cloning it 18:19:34 <chillcore> yes? 18:19:49 <Ammler> it does somehow convert the ' to some html entity, you need to fix before you save settings 18:20:04 <Ammler> that is why that old bug arised 18:20:12 <Ammler> again 18:21:03 <Ammler> we need to update redmine to 2 but it will need rails3, which needs some big system updates 18:21:20 <Ammler> also I am not sure, the plugins will still work 18:23:29 <Brot6> ChillCores PatchPack - Bug #4778 (Closed): DevZone compile failed XcompilerX @ http://dev.openttdcoop.org/issues/4778 18:23:29 <Brot6> ChillCores PatchPack - Bug #4778 (Closed): DevZone compile failed XAmmlerX @ http://dev.openttdcoop.org/issues/4778#change-12944 18:27:22 <chillcore> I fixed that ' , but did I at the same time screw things up too (again)? 19:24:59 *** Alberth has joined #openttdcoop.devzone 19:36:06 <chillcore> Ammler, before I do something stupid 19:36:11 <chillcore> abort: push creates new remote head e991293fea25! 19:36:31 <chillcore> do I use -f or will that cause trouble? 19:37:30 <Alberth> usually not use -f :) 19:37:44 <chillcore> hi alberth 19:37:51 <Alberth> hi chillcore 19:38:08 <Alberth> do you understand what a "head" is here? 19:38:26 <chillcore> I know but I have a new repo and the head is still trunk at the moment 19:38:44 <chillcore> needs to be patched revision. 19:38:53 <chillcore> this is first commit 19:39:22 <Alberth> but apparently, you use an older revision to start from, thus 19:40:00 <Alberth> which is what the warning is about 19:40:17 <frosch123> likely you want to rebase 19:40:38 <frosch123> "new head" means you made a branch 19:40:46 <chillcore> yes, fixing that savegame eating bug in my patchpack but the compile farm did not really cooperate aymore., Alberth 19:41:12 <chillcore> I updated to r22555 patched compiled and now I want to push that yes, frosh 19:41:30 <chillcore> frosch123: ;) 19:42:57 <chillcore> so I am tempted to use -f on push ... but want to avoid having to restart again. Ammler and planetmaker have helped me pretty much all day 19:43:33 <chillcore> so I don't think they want to restart another time again. 19:44:57 <chillcore> frosch123: likely you want to rebase >>> does that mean updating to newer trunk ... not with this patchpack no. 19:45:33 <Alberth> yes, rebase means that you move the branching point (ie now r22555 for you) 19:45:50 <chillcore> that is not what I desire to do. 19:47:19 <chillcore> A branch is fine in this case as I will be commiting on top of that each time without using the MQ that causes problems. 19:48:15 <chillcore> As long as it is the branch hat produces the resulting binaries and the two heads don't argue. 19:48:40 <Alberth> I don't know what the CF does in such a case. 19:49:30 <Alberth> two heads is not much of a problem except for you, as it is kind of confusing to find the ends back in the sea of revisions :p 19:50:18 <chillcore> me neither and I already made so many booboos today. ;) 19:50:44 <Alberth> so you learned a lot today :) 19:50:48 <chillcore> filther on author solves that (if needed) 19:51:20 <chillcore> yeah, amongst which how to avoid making booboos by first asking 19:51:22 <chillcore> lol 19:51:30 <Alberth> the other head is trunk from 22556 to 249XX ? 19:52:51 <frosch123> well, the devzone seems to be stuck at r591 19:53:04 <frosch123> http://dev.openttdcoop.org/projects/chillpp/repository/revisions <- doesn't make sense :) 19:53:04 <chillcore> yes, alberth 19:53:39 <chillcore> I know frosch123 , but I cloned it a little while ago and it is fine. maybe needs some time to update 19:54:34 <Alberth> I wonder why you didn't stop at r22555 19:55:05 <chillcore> I cloned and it was at 24901 19:56:14 <Alberth> hmm, what would happen if you clone your repo at the patch head? 19:56:42 <chillcore> it is a copy of hg.openttd.org/openttd/trunk.hg 19:57:02 <Alberth> hmm, makes no difference of course, the remote still has the other trunk revisions :( 19:58:53 <chillcore> If CF compiles at tip it is not not be a problem having two heads? but I do not know what the CF does 19:59:57 <Alberth> there is hg strip, but you need that at the remote repository 20:01:26 <chillcore> If I were a week younger if it were not for the effort of the people that have invested all this time ... I would just push -f and see what happens. 20:03:05 <chillcore> testing hg strip localy is of little use I assume? 20:04:05 <Alberth> it say "The strip command removes the specified changesets and all their descendants..." I am not sure whether that are also descendants which are in a different branch 20:05:33 <Alberth> afaik, if you clone your patched head, it should not clone the trunk revisions r22556 and higher. That seems a useful local test to me. 20:05:55 <Alberth> If it works, then at least you have a way to produce the repo you really want with little effort 20:06:25 <Alberth> hmm, perhaps you can even drop everything older than r22555 ? 20:06:33 <Alberth> (if you want that, that is) 20:07:52 <Alberth> hmm, perhaps only for SVN 20:08:47 <chillcore> that would be good also there will be no more bumping coming from me in this case... if someone wants something different later on he/she can still pull the later revisions back in right. 20:09:28 <Alberth> yeah, I am somewhat surprised you started again maintaining the old patch pack 20:10:10 <chillcore> I was not going to but this bug ate savegames ... 0 bytes left. 20:10:33 <Alberth> ieks :) 20:11:52 <chillcore> unfreed memory i the progsig patch ... and the problem would only show up saving the next loaded game. I should be lucky to even have found that. 20:12:28 <Alberth> that's a nice one to find indeed :) 20:13:27 <Alberth> hmm, we need a devzone sys admin and perhaps a CF person to get further, I fear 20:14:28 <chillcore> most likely. I am really tempted but I am not going to ... 20:14:39 <chillcore> nice talking to you 20:14:52 <Alberth> it's quite safe sitting at your hard-disk :) 20:15:14 <Alberth> do you have other plans w.r.t. coding/patching? 20:15:31 <chillcore> yeah and the new version is posted already at the forums so no rush 20:16:19 <Alberth> oh, I remember now, you wrote a gui for the map generator 20:16:56 <chillcore> I am looking at the moreheightlevels patch ... but fear that if I fix coding style again it might be in vein. so I wait a bit with that 20:17:11 <chillcore> and that gui too ofcourse 20:17:27 <chillcore> I already cleaned it up a bit more 20:18:18 <chillcore> the code that is. functionlity is still as last reported in the thread 20:18:50 <chillcore> I would very much like to add other settings like height and rivers and whatever relates to terrain 20:18:54 <Alberth> I don't have much time for OpenTTD currently, pretty much concentrating fully on getting FreeRCT up & running 20:19:32 <Alberth> there is also a re-design of the GUI there being planned/done by hackalittlebit; not sure of its state though 20:19:49 <chillcore> and a preview pane lbut that is for later first I want to get what I have bugfree 20:20:13 <chillcore> I will have to check the forums ... I fell a bit behind the past year 20:20:27 <chillcore> How is FreeRCT comming? 20:20:30 <Alberth> but it may be interesting to have a look at it, let me see whether I can find it 20:21:03 <Alberth> FreeRCT has moving guests, buying stuff. Unfortunately, the running costs are higher than the profits :p 20:21:22 <Alberth> http://freerct.blogspot.nl/ 20:21:23 <Webster> Title: FreeRCT (at freerct.blogspot.nl) 20:22:43 <chillcore> I still have a checkout of some early revision. I think it only has heightlevel changing and paths. 20:23:04 <Alberth> http://bugs.openttd.org/task/5147 20:23:45 <Alberth> http://www.gpwiki.org/iotd/ FreeRCT has moved on since then :) 20:23:46 <Webster> Title: GPWiki's Featured Image (at www.gpwiki.org) 20:26:59 <chillcore> nice, I like what im seeing; thank you for that FS link too, going to bookmark it and have a good read in a bit as it is a bit lengthy 20:28:18 <Alberth> :) 20:29:50 <Alberth> http://wiki.openttd.org/Todo_list at the bottom has more GUI re-arrangement stuff, but that may be out of scope for you 20:30:34 <Alberth> http://wiki.openttd.org/GUI_re-arrangement#Main_window_layout Hmm, perhaps not :) 20:31:17 <Alberth> but as usual, at least 2 competing non-finished attempts :p 20:33:52 <chillcore> I am more leaning towards smaller changes that are trunkable than maintining a patchpack again. maybe that terrain generator could be seen a step in the direction of "Redesign the process of starting a new game." 20:34:52 <chillcore> Mind you I have been struggling to create the simplest gui for two years and this is the first time I actually succeeded ... just could not grasp it ;) 20:34:52 <Alberth> in my view, users need less knobs, not more 20:35:31 <Alberth> the imho big hurdle is the totally illogical work flow that you have for a new game 20:35:40 <chillcore> yes all tthe parameters would be a bit too much for the average joe. 20:36:13 <Alberth> :o in that case, your first succesful attempt looks great 20:36:58 <Alberth> if you want some help with window programming, I do know some parts of it quite well :p and you're welcome to ask me 20:37:52 <Alberth> these re-arragement ideas are mostly about getting a less insane order :p 20:40:09 <chillcore> indeed, but there are so many things to consider at the same time ... 20:42:28 <chillcore> I like the advanced settings improvement. 20:42:36 <Alberth> yeah, I think if you try it all together you never get anything done. The trick is going to be to find the right point for starting to make small changes 20:44:01 <Alberth> frosch did most work on the advanced settings 20:44:27 <chillcore> so better, more clear, grouping of new game setting to start 20:44:52 <chillcore> and a fine job he did ;) 20:46:39 <Alberth> re-arrangement is about getting a logical flow, ie encounter newgrf settings and so on before 'generate game' 20:47:10 <chillcore> although I still do not get to filter on not "all settings that have default settings" (and neither have I writen a patch for that) 20:47:33 <frosch123> i still do not see the purpose :p 20:47:44 <frosch123> you could as well add a "randomise settings" button :p 20:48:15 <Alberth> neither do I, unless "default settings" would be something I can define 20:48:42 <chillcore> now that is an idea ....frosch123 20:48:50 <Alberth> hmm, and then I'd want the collection of non-default settings :) 20:49:24 <chillcore> you can already filter on that 20:50:03 <Alberth> on my changes w.r.t. what I see as default? :D 20:50:17 <Alberth> that would be really great ;) 20:50:22 <chillcore> "have default values" not have default settings as they all do 20:51:03 <frosch123> Alberth: he wants a filter for "all settings i haven't changed yet" 20:51:04 <Alberth> ie I think every user has a different idea of what default should be, that is, nobody plays with "default settings" I think 20:51:12 <chillcore> I admit It would be of little use in general 20:51:21 <frosch123> "i am fine with everything, except the defaults" :) 20:52:18 <Alberth> chillcore: name one proper use case :) 20:52:47 *** Lakie has quit IRC 20:53:05 <chillcore> I recently messed up my config file (losing all custom tuned trunk settings) and I had to go through every trunk setting to get it back as it was before. 20:54:03 <chillcore> trying to save to the config file while being in editor ode was a bad idea ;) 20:54:51 <Alberth> but then 1/2 of the defaults are things you like, and 1/2 are things you don't like, so it doesn't pay you much 20:55:41 <chillcore> being able to filter on defaults would have been faster. other than that there is indeed little use for this feature and I am not going to cry over it neither 20:55:42 <Alberth> and for a case that almost never happens :) 20:56:03 <chillcore> as mentioned 20:56:31 * Alberth nods (typing is a bit laggy every now and then :) ) 20:56:49 * chillcore nods back 21:03:01 <chillcore> hmm the track hackalittlebit is on with his gui re-design is indeed pretty interesting 21:06:52 <Brot6> Industrial Stations Renewal - Revision 21:44382de88e98: Fix: Correct cargo label for scrap metal Xmart3pX @ http://dev.openttdcoop.org/projects/isr/repository/revisions/44382de88e98 21:11:08 <Alberth> good night 21:11:30 <chillcore> good night Albert 21:12:18 *** Alberth has left #openttdcoop.devzone 21:16:30 *** ODM has quit IRC 21:17:20 <chillcore> good night all 21:17:58 *** chillcore has quit IRC 21:26:00 <Brot6> Industrial Stations Renewal - Revision 22:9afeaadc9151: Feature: [FIRS] Add FIRS cargos to goods sta... Xmart3pX @ http://dev.openttdcoop.org/projects/isr/repository/revisions/9afeaadc9151 22:44:59 *** frosch123 has quit IRC