Times are UTC Toggle Colours
00:21:23 *** Madis has quit IRC 00:40:09 *** ODM has quit IRC 01:35:39 *** welshdragon has joined #openttdcoop.devzone 01:57:23 *** KenjiE20|LT has joined #openttdcoop.devzone 01:57:35 *** KenjiE20 has quit IRC 02:31:14 *** Hirundo has quit IRC 02:31:14 *** Ammler has quit IRC 02:40:38 *** Ammler has joined #openttdcoop.devzone 02:41:02 *** Hirundo has joined #openttdcoop.devzone 02:52:55 *** welshdragon has quit IRC 03:56:17 *** KenjiE20|LT has quit IRC 05:01:36 <PeterT> happpppyyy new year east coasters! 06:02:58 *** PeterT has quit IRC 08:45:57 *** andythenorth has joined #openttdcoop.devzone 09:03:58 *** andythenorth has quit IRC 09:04:50 *** andythenorth has joined #openttdcoop.devzone 09:22:05 *** ODM has joined #openttdcoop.devzone 09:44:15 *** Madis has joined #openttdcoop.devzone 09:53:55 *** Madis has quit IRC 09:55:47 <Webster> Latest update from devactivity: FIRS Industry Replacement Set - Revision 397: Change: fixed my mistake with ground tile for Junk ... <http://dev.openttdcoop.org/projects/firs/repository/revisions/397> || FIRS Industry Replacement Set - Feature #480: Fishing Harbour <http://dev.openttdcoop.org/issues/480#change-1874> || FIRS Industry Replacement Set - Revision 396: Change: correction of my mistake with ground sprite... <http://dev.openttdcoop.org/projects/firs/repository/revisions/396> || FIRS Industry Replacement Set - Revision 395: Change: improved layout for Fishing Harbour <http://dev.openttdcoop.org/projects/firs/repository/revisions/395> 10:46:18 *** Webster has joined #openttdcoop.devzone 10:48:16 *** KenjiE20 has joined #openttdcoop.devzone 11:18:18 *** andythenorth has quit IRC 11:32:14 <Webster> Latest update from devactivity: FIRS Industry Replacement Set - Revision 398: Change: bauxite mine now uses correct ID (05) and i... <http://dev.openttdcoop.org/projects/firs/repository/revisions/398> 12:31:08 <Ammler> andy removed the tags for fish? 12:57:07 *** welshdragon has joined #openttdcoop.devzone 13:56:58 *** PeterT has joined #openttdcoop.devzone 14:06:33 *** andythenorth has joined #openttdcoop.devzone 14:21:54 *** welshdragon has quit IRC 14:21:59 *** andythenorth has quit IRC 14:40:41 *** welshdragon has joined #openttdcoop.devzone 14:43:43 *** andythenorth has joined #openttdcoop.devzone 14:49:53 <Webster> Latest update from devactivity: FIRS Industry Replacement Set - Feature #458: Bauxite Mine <http://dev.openttdcoop.org/issues/458#change-1875> 14:51:06 <Ammler> andythenorth: you removed the tags with your merge at fish 14:51:29 <andythenorth> Ammler: oops :o 14:51:39 <andythenorth> I'm sure I didn't intend to! 14:51:56 <andythenorth> lets see if we can fix it... 14:52:04 <Ammler> it is quite strange, why you needed to merge 14:52:12 <Ammler> as you are the only committer 14:52:14 <andythenorth> I thought so too 14:52:21 <andythenorth> all I did was: 14:52:28 <andythenorth> make two changes 14:52:32 <andythenorth> commit 14:52:34 <andythenorth> tag 0.1.1 14:52:35 <andythenorth> hg up 14:52:40 <andythenorth> I think 14:52:53 <andythenorth> I have the shell open still if we wanted to check... 14:52:56 <Ammler> easiest might be to retag 14:53:18 <Ammler> he 14:53:47 <Ammler> you know, always before you commit something, you should check head to be on tip 14:53:57 <Ammler> else you create a new head 14:54:26 <andythenorth> looks like that's what happend 14:54:31 <andythenorth> happened /s 14:54:36 <Ammler> yes, you tagged 0.1 14:54:40 <andythenorth> pdq2s-macbook-3:fish_build andy$ hg commit -m "Change: pushed start date for current ships back to 1870...bit unrealistic, but players wanted it and I don't mind in this case..." 14:54:41 <andythenorth> created new head 14:54:52 <Ammler> then hg up 01 and forgot to hg up to tip again after 14:55:11 <andythenorth> ok, to fix? 14:55:19 <andythenorth> I want to tag to 0.1.1 14:55:26 <Ammler> as said, just readd the taggs 14:55:34 <Ammler> shall I? 14:55:48 <andythenorth> I've just done it 14:57:14 <Ammler> no, you didn't 14:57:18 <andythenorth> oh :o 14:57:23 <Ammler> but well, doesn't matter that much 14:57:33 <Ammler> you new tag isn't the same anymore 14:58:04 <Ammler> if you run hg tag, it makes the tag on tip 14:58:24 <andythenorth> makes sense 14:58:38 <andythenorth> in this case, nothing has changed in FISH since I *thought* I'd tagged 14:59:25 <Ammler> indeed, that's why I wrote, it doesn't matter 14:59:39 <andythenorth> so I don't have a tag for 0.1 15:00:13 <andythenorth> I'm confused by it frankly 15:00:13 <andythenorth> http://mercurial.selenic.com/wiki/Tag#How_do_tags_work_in_Mercurial.3F 15:00:14 <Webster> Title: Tag - Mercurial (at mercurial.selenic.com) 15:00:26 <andythenorth> "Updating a working dir to a particular tag will take that directory back to a point before the tag itself existed." 15:00:53 <Ammler> yes 15:01:18 <Ammler> because adding the tag itself needs a commit too 15:01:30 <Ammler> so you never can commit a tag to itself :-) 15:01:43 <Ammler> or in other words, you can't tag tip 15:03:02 <Ammler> that is why you created those 2 heads 15:03:29 <Ammler> http://mz.openttdcoop.org/hg/fish/graph/tip 15:03:53 <andythenorth> the instructions I have are: 15:04:00 <andythenorth> "hg tag 0.5" 15:04:04 <andythenorth> "hg up 0.5" 15:04:18 <andythenorth> is that wrong? 15:04:27 <Ammler> no, then you create the release bundles 15:04:40 <Ammler> but after that you need again to update to tip for new commits 15:04:55 <Ammler> as you see on the graph 15:04:59 <Webster> Latest update from devactivity: FISH - Revision 230: Added tag 0.1.1 for changeset ed8c46665c7c <http://dev.openttdcoop.org/projects/fish/repository/revisions/230> || FIRS Industry Replacement Set - Feature #480: Fishing Harbour <http://dev.openttdcoop.org/issues/480#change-1876> 15:05:14 *** welshdragon has quit IRC 15:05:48 *** welshdragon has joined #openttdcoop.devzone 15:08:44 <Ammler> hg tag -ra459ad0c770ce35460bcd40c323ea03c06cffb48 0.1 15:45:15 *** andythenorth_ has joined #openttdcoop.devzone 15:45:15 *** andythenorth has quit IRC 15:52:58 <Webster> Latest update from devactivity: FIRS Industry Replacement Set - Revision 399: Change: Fishing Harbour layout 4 checks surrounding... <http://dev.openttdcoop.org/projects/firs/repository/revisions/399> 15:53:43 <PeterT> get to revision 400 today :-) 16:14:47 <Hirundo> I have re-thought how IS is to be managed 16:15:02 <PeterT> by playing the game at #jonty? 16:15:41 <Hirundo> Allow me to write down my flash of inspiration, before it is forgotten :) 16:16:38 <Hirundo> I suggest creating a patch repo containing the patches, corresponding to my local .hg/patches 16:17:36 <Hirundo> Then a second, separate repo (the current) that contains trunk with patches applied 16:18:53 <Hirundo> Whenever I then make changes to the patch queue, I copy those (automatically) to the second repo, so a full copy of IS is always available 16:19:44 <PeterT> So, there will be two versions of IS 16:20:29 <Hirundo> Two repositories, one version 16:20:35 <PeterT> Ok 16:20:43 <PeterT> so first one is just trunk with IS in it 16:20:47 <PeterT> and second is just patches of IS? 16:21:11 <Ammler> patches of trunk, I guess 16:21:17 <Hirundo> 'trunk with IS in it' is basically what we have now 16:23:33 <Webster> Latest update from devactivity: FIRS Industry Replacement Set - Bug #706 (New): Bauxite mine not appearing in tropic <http://dev.openttdcoop.org/issues/706> || FIRS Industry Replacement Set - Revision 400: Change: improved Bauxite Mine layout <http://dev.openttdcoop.org/projects/firs/repository/revisions/400> || FIRS Industry Replacement Set - Revision 399: Change: Fishing Harbour layout 4 checks surrounding... <http://dev.openttdcoop.org/projects/firs/repository/revisions/399> || FISH - Revision 230: Added tag 0.1.1 for changeset ed8c46665c7c <http://dev.openttdcoop.org/projects/fish/repository/revisions/230> || FIRS Industry Replacement Set - Feature #480: Fishing Harbour <http://dev.openttdcoop.org/issues/480#change-1876> || FIRS Industry Replacement Set - Feature #458: Bauxite Mine <http://dev.openttdcoop.org/issues/458#change-1875> || FIRS Industry Replacement Set - Revision 398: Change: bauxite mine now uses correct ID (05) and i... <http://dev.openttdcoop.org/projects/firs/repository/revisions/398> || FIRS Industry Replacement Set - Revision 397: Change: fixed my mistake with ground tile for Junk ... <http://dev.openttdcoop.org/projects/firs/repository/revisions/397> || FIRS Industry Replacement Set - Feature #480: Fishing Harbour <http://dev.openttdcoop.org/issues/480#change-1874> || FIRS Industry Replacement Set - Revision 396: Change: correction of my mistake with ground sprite... <http://dev.openttdcoop.org/projects/firs/repository/revisions/396> || FIRS Industry Replacement Set - Revision 395: Change: improved layout for Fishing Harbour <http://dev.openttdcoop.org/projects/firs/repository/revisions/395> || FIRS Industry Replacement Set - Revision 394: Documentation: credited Dan MacK for fishing boat <http://dev.openttdcoop.org/projects/firs/repository/revisions/394> || FIRS Industry Replacement Set - Revision 393: Change: one layout for Fishing Harbour mostly done <http://dev.openttdcoop.org/projects/firs/repository/revisions/393> || Infrastructure Sharing - Revision 14566: [IS] Change: Make head of 2.0 a closed branch. <http://dev.openttdcoop.org/projects/is2/repository/revisions/14566> || FIRS Industry Replacement Set - Revision 392: Change: some additional graphics added to Fishing H... <http://dev.openttdcoop.org/projects/firs/repository/revisions/392> 16:23:45 <Hirundo> I just need to figure out whether these two repositories will correspond to / and /.hg/patches/, or that they need to be two separate directories 16:24:38 *** ODM has quit IRC 16:28:26 *** ODM has joined #openttdcoop.devzone 16:29:16 <Ammler> Hirundo: I suggest hooks which do automatically apply the patch queue to the current repo 16:29:36 <Ammler> could be done serverside 16:36:50 <Hirundo> Might be good to run that on the server, yes 16:38:51 *** andythenorth_ has quit IRC 16:39:36 *** andythenorth has joined #openttdcoop.devzone 16:43:09 <andythenorth> planetmaker: hai hai 16:43:55 <andythenorth> might we look at the parameter problem? I would like to 'release' an improved FIRS with the bauxite mine, but the params problem is a blocker! 16:44:10 <andythenorth> np if you're busy ;) 16:54:25 <Webster> Latest update from devactivity: FIRS Industry Replacement Set - Revision 401: Feature: additional layout for Fishing Harbour <http://dev.openttdcoop.org/projects/firs/repository/revisions/401> 16:55:52 <Ammler> andythenorth: is the parameter issue documented? 16:56:15 <andythenorth> Ammler: http://dev.openttdcoop.org/issues/702 16:56:28 <andythenorth> could use better info 16:56:41 <andythenorth> makes FIRS unusable with NARS 2 16:56:45 <andythenorth> maybe other sets 16:57:15 *** PeterT has quit IRC 17:41:19 <Webster> Latest update from devactivity: FIRS Industry Replacement Set - Revision 402: Feature: additional layouts for Fishing Harbouer <http://dev.openttdcoop.org/projects/firs/repository/revisions/402> 17:54:13 *** andythenorth has quit IRC 18:00:18 *** andythenorth has joined #openttdcoop.devzone 18:08:45 *** PeterT has joined #openttdcoop.devzone 19:02:22 <Ammler> there was no firs nightly since nov 19:03:01 <andythenorth> Ammler: why? errors? 19:03:10 <Ammler> no 19:03:43 <Ammler> almost fine http://bundles.openttdcoop.org/download.php?file=firs/nightlies/compile-log/firs-nightly-r402-compile-error.log 19:04:16 <andythenorth> wonder why that is 19:04:28 <andythenorth> planetmaker created those. they're committed, I have them 19:04:34 <andythenorth> maybe awk fails on the server? 19:15:56 <andythenorth> Ammler: I meant planetmaker committed those files (not those errors!) 19:16:13 <andythenorth> or they're files that are generated by awk 19:16:22 <andythenorth> I'm not sure without checking :o 19:17:06 <planetmaker> the two pnfo files need not exist and are generated. 19:17:17 <planetmaker> the error messages concerning them are bogus 19:17:21 <planetmaker> and a happy new year 19:17:28 <andythenorth> happy new year :) 19:29:47 <Webster> Latest update from devactivity: FIRS Industry Replacement Set - Revision 403: Change: Fishing Harbour doesn't use default foundat... <http://dev.openttdcoop.org/projects/firs/repository/revisions/403> 19:31:52 *** andythenorth has quit IRC 19:36:22 <planetmaker> !password 19:37:30 <Ammler> !kick planetmaker (wrong channel) 19:37:54 <Ammler> oh guets Nüüs auch dir :-) 19:38:12 <planetmaker> :-) 19:38:19 <planetmaker> Und Dir auch :-) 20:35:07 *** Frankr has joined #openttdcoop.devzone 21:08:48 <Frankr> is devzone site down atm? 21:10:48 <planetmaker> shouldn't but seems like 21:13:01 <Ammler> Frankr: check topic :-) 21:13:28 <planetmaker> until next year? Wow, that's long :-P 21:13:33 <Frankr> lol 21:13:49 <Frankr> i see 21:13:54 <Frankr> 2011 it is then 21:14:36 <Ammler> yes :-P 21:18:18 *** PeterT has quit IRC 21:29:12 <Frankr> working now 21:39:15 *** PeterT has joined #openttdcoop.devzone 23:11:54 *** ODM has quit IRC