Log for #openttdcoop.devzone on 3rd July 2010:
Times are UTC Toggle Colours
00:01:29  *** KenjiE20 has quit IRC
00:34:07  *** Yexo_ has joined #openttdcoop.devzone
00:34:07  *** Yexo has quit IRC
00:35:54  *** Yexo has joined #openttdcoop.devzone
00:35:54  *** Yexo_ has quit IRC
05:25:05  <Brot6> OpenTTD-GUI - Revision 15420:50862042ba05: - Change: Adjust a comment (planetmaker) @
06:08:56  <andythenorth> planetmaker: morning
06:09:11  <planetmaker> moin andythenorth
06:09:25  <andythenorth> I have been reading
06:09:26  <Webster> Title: Chapter 8. Managing releases and branchy development (at
06:09:41  <andythenorth> I am thinking branching 0.3 in the same FIRS repo is what I need to do?
06:10:09  <planetmaker> it's untested so far with our CF. But that *should* work
06:10:30  <planetmaker> but I'd do exactly that: branch 0.3, if you want to continue on 0.4 at the same time
06:11:06  <andythenorth> so 0.4 would be 'default'
06:11:11  <planetmaker> yes
06:11:24  <andythenorth> and we can collaborate on 0.3...
06:11:43  <andythenorth> but I have to remember to hg update to correct branch before committing?
06:11:58  <planetmaker> you even should update to the correct branch before editing
06:12:16  <planetmaker> or you'll edit the wrong source
06:12:49  <planetmaker> hg up default or hg up branchname
06:12:57  <andythenorth> k
06:13:26  <planetmaker> hg up branchname might not work
06:14:18  <andythenorth> hg book implies it should
06:16:58  <planetmaker> it does indeed
06:17:22  <andythenorth> only one way to find out....
06:17:39  <andythenorth> I don't need to prep anything for this, I just branch right?
06:20:41  <planetmaker> You don't. Just hg branch branchname
06:20:43  <planetmaker> BUT!
06:20:48  <planetmaker> don't name it 0.3
06:20:52  <planetmaker> or?
06:21:00  <planetmaker> we should think of a good name before
06:21:26  <planetmaker> what should the reported version look like? Not diferent at all? Somewhere the branch name?
06:21:59  <planetmaker> what I don't know is what will result in, if you have a tag 0.3.0 and a branch 0.3.
06:22:05  <planetmaker> Hm... though... they're different
06:22:20  <Brot6> FIRS Industry Replacement Set - Revision 1012:1e8be871f3a7: Branched 0.3 (andythenorth) @
06:22:28  <planetmaker> right...
06:22:32  <andythenorth> I read your message above too late :P
06:22:50  <planetmaker> yeah
06:23:43  <andythenorth> there's no harm.  Branches can be eliminated
06:23:53  <planetmaker> not quite
06:24:23  <planetmaker> why did you call the last version 0.2 and not 0.2.0?
06:24:41  <planetmaker> if you make such distinction there's no harm which can result afaik
06:25:22  <andythenorth> never cross my mind to call it 0.2.0
06:25:34  <andythenorth> I have np with doing so in future though :)
06:25:55  <planetmaker> you did before with 0.1.x
06:26:17  <andythenorth> memory is malleable :)
06:26:29  <andythenorth> especially mine
06:26:40  <andythenorth> or perhaps I mean porous
06:26:49  <andythenorth> anyway things fall out of it :P
06:26:51  <planetmaker> so... let's keep releases as x.y.z and branches as x.y
06:27:05  <planetmaker> then it's in any case unambigeous
06:27:52  <planetmaker> but question, andythenorth: FIRS nightlies: only default branch?
06:28:03  <planetmaker> both branches? Only 0.3?
06:28:19  <andythenorth> nightlies == trunk == default
06:28:24  <planetmaker> ok
06:28:41  <andythenorth> branches for allowing concurrent development while FooBar is back
06:28:54  <planetmaker> :-)
06:28:55  <andythenorth> so releases can be made faster while allowing work on unfinished features
06:29:38  <planetmaker> we'll need to check the CF :-)
06:31:22  <andythenorth> CF?
06:31:32  <andythenorth> compile farm
06:34:08  <planetmaker> ^
06:34:32  <planetmaker> I guess so far it'll make onl the latest revision - whatever branch it is.
06:34:38  <planetmaker> Anyway... not much of a worry now
06:35:18  <andythenorth> does the compile farm use hg?
06:35:19  <Brot6> FISH - Revision 376:f89c3f5dd8cf: Fix: Medium Coaster was missing bow / stern wake sprites (andythenorth) @
06:36:51  <planetmaker> what else should it use for a hg repo?
06:40:22  <andythenorth> thought so
06:40:34  <andythenorth> so it will make whatever branch it is looking at?
06:40:44  <andythenorth> not the newest?
06:41:02  <planetmaker> currently
06:41:10  <planetmaker> but that can be changed
06:41:12  <planetmaker> don't worry
06:42:00  <andythenorth> I think that's in our favour :)
06:44:11  <Brot6> FISH - Revision 377:1a44a3445ae2: Fix: previous fix to Medium Coaster added too many bow / stern ... (andythenorth) @
06:45:07  <Brot6> #openttdcoop - Feature #1063 (New): compiling nightlies with branchy repos (planetmaker) @
06:45:55  <Brot6> FISH - Revision 378:a4c5341e886e: Fix: bow wake sprites transposed for Small Coaster loaded movin... (andythenorth) @
06:47:05  <planetmaker> gah. This is disgusting 27°C at not even 9am!
06:51:26  <andythenorth> commiserations
06:51:30  <andythenorth> sounds like Bombay
06:52:49  <Brot6> fish: update from  to 0.6.0 done (1 errors) -
06:52:58  <Brot6> FISH - Revision 379:37089b881277: Change: updated changelog.txt (andythenorth) @
06:52:58  <Brot6> FISH - Revision 380:884655514b27: Added tag 0.6.0 for changeset 37089b881277 (andythenorth) @
06:55:04  *** Alberth has joined #openttdcoop.devzone
06:55:49  <andythenorth> :o
06:55:59  <andythenorth> bananas is sad about changelog.txt in FISH
06:57:22  <planetmaker> hard to believe
06:57:42  <planetmaker> what file do you try to upload?
06:57:53  <planetmaker> and did you compare md5sums? :-)
06:58:39  <andythenorth> planetmaker: I tried and fish-0.6.0.tar
06:58:54  <andythenorth> bananas couldn't find anything useful in the zip
06:59:04  <andythenorth> in the tar it stumbles on ._changelog.txt
06:59:05  <planetmaker> yes
06:59:17  <planetmaker> ah. ._changelog.txt
06:59:21  <planetmaker> not changelog.txt
06:59:34  <planetmaker> does the tar have your ._changelog.txt?
06:59:39  <planetmaker> it doesn't have here
07:00:02  <planetmaker> tar tf fish-0.6.0.tar
07:00:07  <planetmaker> what does it tell^ ?
07:01:17  <andythenorth>
07:05:09  <planetmaker> hmpf
07:05:38  <planetmaker> explanation: the ._changelog.txt encodes osx file system special information
07:05:55  <planetmaker> and tar adds such file for each file which has extended attributes
07:06:08  <Ammler> andythenorth: you should use the package from the server
07:06:18  <planetmaker> I *thought* I made the bundling already so that it filteres these. Obviously not yet
07:06:43  <planetmaker> But indeed, andythenorth just download from the server and upload that :-)
07:09:07  <Ammler> upload the tar
07:09:30  <Ammler> or did you already update the makefile?
07:10:38  <planetmaker> no
07:12:52  <andythenorth> FISH 0.6.0 released
07:13:12  <andythenorth> FISH can probably get to 1.0 soon :)
07:13:34  <planetmaker> what does actually "xattr docs/changelog.txt" tell you?
07:13:40  <andythenorth> afk - back in a minute
07:13:40  <Ammler> isn't releasesing easy now?
07:13:48  <planetmaker> it is :-)
07:13:53  <Ammler> :-P
07:16:58  <andythenorth> Ammler: yes :)
07:17:26  <andythenorth> planetmaker:
07:17:41  <planetmaker> hm, right
07:17:55  <Brot6> #openttdcoop - Feature #1063: compiling nightlies with branchy repos (Ammler) @
07:18:48  <planetmaker> andythenorth: <-- if you apply that patch. Does your tar look better than?
07:20:15  <planetmaker> just run a "make bundle_tar" and a subsequent "tar tf fish-nightly.tar"
07:20:27  <planetmaker> assuming you updated to tip again
07:22:37  <planetmaker> hm... I added this protection for extended attributes. But that one place was missing.
07:24:20  *** dan123 has joined #openttdcoop.devzone
07:25:30  <andythenorth> planetmaker: that's removed ._changelog.txt
07:25:34  <andythenorth> nicely
07:28:19  <planetmaker> good.
07:28:38  <planetmaker> I'll commit that with the next makefile update
07:28:44  <planetmaker> which I should do somewhat soon-ish
07:29:15  * andythenorth ponders
07:29:21  <andythenorth> what to code
07:30:27  <andythenorth> planetmaker: fancy tackling parameters?  Or too hot?
07:30:28  <Brot6> Example NewGRF Project - Revision 107:67dcbf16d30f: Fix (r89): Also don't put extended attributes... (planetmaker) @
07:31:13  <planetmaker> andythenorth: did you see my patch?
07:33:19  <andythenorth> parameters?  I'll look
07:34:12  <planetmaker> ^
07:34:17  * andythenorth ponders what happens if parameters are changed on a savegame
07:34:31  <planetmaker> it's like a newgrf change. somewhat
07:34:43  <andythenorth> so likely to cause problems
07:34:48  <andythenorth> hmm
07:34:59  <andythenorth> branching raises the question of which file is active in game
07:35:17  <planetmaker> andythenorth: in principle yes.
07:35:29  <planetmaker> It depends upon what they do / trigger
07:35:54  <planetmaker> the logs of my SErails savegame look rather ugly ;-)
07:39:06  <andythenorth> I am wondering how to play test in a sane way with branches
07:40:26  *** dan123 has quit IRC
07:40:50  <planetmaker> andythenorth: the makefile will just produce a grf
07:41:05  <planetmaker> It will be called in the makefile all the same firs-nightly-rXYZ
07:41:18  <planetmaker> where XYZ is the revision of the repo
07:41:43  <planetmaker> so... you can for now swap versions nicely, just updating the firs-nightly.tar
07:41:47  <andythenorth> ok so I might need to be careful not to break save games that I'm using for testing
07:41:48  <planetmaker> in your newgrf folder
07:41:50  <andythenorth> otherwise fine
07:42:21  <planetmaker> yes. If you just have different savegames for different versions you'll be fine
07:42:49  <planetmaker> loading the other one with the 'wrong' firs installed will probably work, too, but at some stage might not be advisable anymore
07:42:56  <andythenorth> :)
07:43:15  <planetmaker> maybe I should add the branch information to the revision?
07:43:48  <Ammler> project-branch-r0
07:44:11  <andythenorth> applying a remote patch with curl is pleasingly simple
07:44:38  <andythenorth> oh
07:44:40  <andythenorth> booom.
07:44:58  <andythenorth> my openttd crashed when I built FIRS :o
07:45:03  <andythenorth> ho hum
07:45:42  <planetmaker> Ammler: yeah, likely
07:46:05  <Brot6> Example NewGRF Project - Revision 108:a8900af67caa: Change [#1017]: Let bundle_zip behave the sam... (planetmaker) @
07:46:08  <andythenorth> planetmaker: the parameters patch introduces 6 errors
07:46:17  <planetmaker> hm
07:46:31  <andythenorth> looks like it might be missing defines
07:46:41  <andythenorth> patch didn't update ids.pnfo?
07:46:52  <andythenorth> no it did
07:46:54  <andythenorth> baffling
07:47:23  <andythenorth> planetmaker:
07:48:42  <planetmaker> alright...
07:52:09  <planetmaker> <- andythenorth
07:53:13  <andythenorth> planetmaker: same errors
07:53:26  <andythenorth> you don't get them locally?
07:55:39  <planetmaker> hm, I do. I didn't compile :-D as it seemed obvious what was wrong
07:56:03  <planetmaker> but "only" wrong escape sequences now ;-)
07:58:16  <planetmaker> hm... the other shift operator doesn't exist :S
08:00:11  <planetmaker> there needs to be done some jump through loops. Oh well
08:05:46  <planetmaker> andythenorth: update
08:05:55  <Brot6> FIRS Industry Replacement Set - Feature #1028: Parameters (new) (planetmaker) @
08:06:48  <planetmaker> now... it needs some way to test whether the parameter processing for open / close actually works...
08:10:02  <andythenorth> builds, no errors
08:10:34  <planetmaker> how do you access those parameters in a varaction2 chain?
08:11:05  <andythenorth> let me see
08:11:22  <Brot6> FIRS Industry Replacement Set - Revision 1013:75c9668eb5ea: Change: experimental code for product... (andythenorth) @
08:11:22  <planetmaker> I looked yesterday... but unsuccessfully
08:11:37  <andythenorth> planetmaker: have a look around line 256 in template_secondary_action23_A.pnfo
08:11:49  <planetmaker> meh. I could then have commited that, too
08:11:51  <andythenorth> it's refreshingly trivial
08:12:05  <andythenorth> think it's just var 7F
08:12:12  <andythenorth> then whatever masking needs to be done...
08:12:41  <andythenorth> adding it to primary should be relatively easy, it already has production change cb handling
08:12:51  <andythenorth> secondary industries will need additional cb handling added
08:12:57  <planetmaker> or give me credit in the commit message
08:14:04  * planetmaker feels ripped-off
08:14:35  <andythenorth> lets see what Brot6 has to say about it in a minute :P
08:14:55  <planetmaker> I know what it will say.
08:15:00  <Brot6> FIRS Industry Replacement Set - Revision 1014:7219f9003871: Change: experimental code for product... (andythenorth) @
08:15:00  <Brot6> FIRS Industry Replacement Set - Revision 1015:89802f2874f7: merge (andythenorth) @
08:15:12  <andythenorth> meh
08:15:15  <planetmaker> that you wrote that patch
08:15:39  <andythenorth>
08:15:45  <andythenorth> I tried to fix the credit :P
08:16:18  <planetmaker> ?
08:16:21  <planetmaker> omg
08:16:47  <andythenorth> I used rollback, then committed again....
08:17:17  <planetmaker> rollback is useless after a push
08:18:04  <planetmaker> you cannot change remote repositories
08:18:07  <andythenorth> :(
08:18:25  <Ammler> r1015?
08:19:03  <planetmaker> Ammler: result of rollback and subsequent pull of the same patch
08:19:55  <Ammler> andythenorth: in such cases hg incoming or outgoing might be helpful
08:20:22  <Ammler> to compare local repo with remote repo
08:20:23  <planetmaker> Ammler: not really. It just is not working to 'hg rollback' a thing which you already pushed
08:20:45  <Ammler> yeah, of course
08:20:56  <planetmaker> this is the failed attempt to do so :-)
08:21:20  <Ammler> but I don't see what he merged
08:21:29  <planetmaker> patch A with patch A
08:21:52  <Ammler> so a pull would have worked
08:22:15  <planetmaker> yes
08:22:33  <planetmaker> don't worry Ammler
08:23:00  <Brot6> FIRS Industry Replacement Set - Revision 1016:20425b0145b3: Credit: planetmaker wrote the paramet... (andythenorth) @
08:23:02  <planetmaker> Don't worry about r1015 and neither about 1013 and 1014 being the same
08:23:06  <planetmaker> arg.
08:23:20  <Ammler> why should I worry?
08:23:23  <planetmaker> now it's getting ridiculous, andythenorth
08:23:25  <andythenorth> it's ok because now 1016 is also pointless :P
08:23:34  <andythenorth> credit where credit is due :D
08:23:48  <Ammler> I just wonder, why people still prefer to merge instead fixing the local repo before push :-)
08:24:24  <andythenorth> I do it because I don't know any different
08:26:19  <planetmaker> The usual procedure is - if you have incoming data and only one local commit: hg rollback, hg up, hg ci -m "blubber"
08:26:28  <planetmaker> but... a merge is just as fine
08:26:40  <planetmaker> it's just for the optics
08:27:30  <Ammler> planetmaker: you should make a difference between a merge and a merge :-P
08:29:15  * andythenorth ponders writing some code :)
08:29:29  <andythenorth> closure stuff is particularly hard to test for :o
08:30:09  <planetmaker> just make for testing purposes the default closure probability ridiculously high
08:30:27  <planetmaker> e.g. make that an internal parameter
08:30:33  <planetmaker> and set it for testing purposes very high
08:30:45  <planetmaker> and then it can be adjusted for game play purposes also easily
08:31:04  <planetmaker> like #define closure_prob 05
08:31:07  <planetmaker> and for testing FF
08:31:09  <planetmaker> or so
08:31:27  <planetmaker> but then... it's some more math involved there, I guess. But in principle such thing should work
08:33:03  * andythenorth thinks
08:33:15  <andythenorth> primary should be tackled first
08:33:38  * planetmaker wonders if FIRS should be converted somewhen to NML, too ;-)
08:33:51  <planetmaker> then it'd actually be fun to write these conditions
08:34:10  <andythenorth> can nml include arbitrary blocks of nfo?
08:34:20  <planetmaker> it can't include any
08:34:38  <planetmaker> why would it?
08:34:48  <planetmaker> for transition? :-)
08:35:08  <andythenorth> rewriting the production code is a firm *no* from me right now
08:35:21  <andythenorth> if anyone else wants to port it I won't block them :P
08:35:32  <planetmaker> hehe
08:35:58  <andythenorth> can nml output nfo, or does it only compile?
08:36:06  <planetmaker> it can output NFO
08:36:12  <andythenorth> we could go nml->nfo have make put them together
08:36:21  <andythenorth> so we include nml in existing FIRS
08:36:24  <planetmaker> that *might* actually work
08:37:26  <planetmaker> but it will be problematic with the IDs... maybe
08:37:45  <planetmaker> maybe the same defines can be re-used
08:38:11  *** ODM has joined #openttdcoop.devzone
08:39:06  <planetmaker> interesting idea to really mix it...
08:40:10  <Ammler> that would need nml to make nfo2grf :-)
08:40:36  <planetmaker> nah, for transition it can be that nml's nfo output is re-used by grfcodec
08:44:22  <Ammler> but using nfo snippets in nml might be a good feature at all
08:44:48  <Ammler> the problem might be the IDs?
08:51:42  <planetmaker> Ammler: using NFO snippets in NML doesn't really sound like a good idea
08:51:47  <planetmaker> It introduces only trouble
08:51:54  <planetmaker> MUCH more trouble than it can ever be worth
08:52:12  <planetmaker> btw, Ammler: if you clone a repo, it updates to branch default
08:52:15  <planetmaker> Just tested
08:52:22  <Ammler> and why is it worth to consider mixing with makefile?
08:52:30  <planetmaker> but you must use hg parent
08:52:32  <planetmaker> not hg tip
08:52:37  <planetmaker> like in my supplied patch
08:52:40  <Ammler> planetmaker: the compiler always does a fresh clone
08:52:46  <planetmaker> yes, I know :-)
08:52:51  <Ammler> so update to default might be useless
08:52:57  <planetmaker> uh?
08:53:08  <Ammler> your patch
08:53:14  <planetmaker> I mean: the current revision which is active: that is default.
08:53:21  <planetmaker> Yes, the hg up default is not needed
08:56:20  <Ammler> I meant
08:56:37  <planetmaker> btw, andythenorth, you should revert r1016. It only introduces ugly trailing white space...
08:56:53  <andythenorth> he
08:57:04  <planetmaker> Ammler: yes, I mean that. The hg up default is not needed
08:58:02  <planetmaker> Ammler: currently we call all default branches 'nightly'
08:58:08  <planetmaker> shall we keep that?
08:58:10  <Ammler> we could for example create a branch stable for releases or so
08:58:22  <Ammler> and then on releases switch to that branch
08:58:24  <planetmaker> I mean... if I introduce now support for branches anyway... then it might be the time to change that
08:58:38  <planetmaker> Ammler: I like the idea to build tags as releases
08:58:47  <planetmaker> branches are then simply not build by the CF
08:58:53  <planetmaker> which... is ok for now
08:59:04  <Ammler> but that is all up to your script
08:59:11  <Ammler> already possible
08:59:12  <planetmaker> as long as it builds tag'ed versions in branches
09:01:09  <planetmaker> Ammler: what's up to my script?
09:01:18  <Ammler> how you build
09:01:28  <Ammler> .devzone/build/package.spec
09:02:02  <Ammler> you have the whole mercurial repo available
09:04:05  <planetmaker> yes... but the question was: do we want to change the default file name(s)?
09:04:11  <planetmaker> which are built every day
09:05:17  <planetmaker> and... where's a .devzone/build/package.spec file?
09:05:23  <planetmaker> I see it in none of the repos I looked
09:05:48  <Ammler> if it isn't there, it uses the .default from the compiler according to the type
09:06:13  <Ammler>
09:08:48  <PeterT> @logs
09:08:48  <Webster> Logs:
09:09:11  <planetmaker> right, ok
09:09:48  <PeterT> <Alberth> welshdragon: he doesn't have an own channel for that kind of questions? <-- yes, but he doesn't know of it. one question that is offtopic isn't going to kill us all anyway :p
09:09:51  <planetmaker> which means it'll work in any case. Which is excellent
09:10:48  <planetmaker> It's rather a question of: is it sensible to call things 'nightly'. Or should we call them 'default' or 'trunk' or <whatever>?
09:10:58  <planetmaker> Hm... or a makefile parameter :-P
09:11:02  <Alberth> sure, except that the question he asked is probably easier answered in the other channel
09:12:44  <Ammler> planetmaker: we could call it <branch>
09:12:51  <Ammler> so yes, they would change to default
09:13:15  <Ammler> and you might have a sep. branch for stable
09:13:19  <planetmaker> Ammler: yes, for all cases which are not default, I'd call it <branch>. The question is, do we want a special rule for default?
09:13:32  <planetmaker> stable would be just another branch. Nothing special
09:13:38  <Ammler> yes
09:14:20  <Ammler> or a branch called something like 1.0
09:14:35  <planetmaker> well. That's what andythenorth used. And it's reasonable
09:15:00  <Ammler> it would look a bit silly then :-)
09:15:09  <planetmaker> yes
09:15:23  <planetmaker> that's why I disabled the branch use for tags :-)
09:16:23  <planetmaker> in the light of that file name you just quoted I thought it might better be up to the person tagging to chose a proper tag
09:16:45  <planetmaker> that person is always free to choose a tag like mysillybranch-0.42
09:17:08  <Ammler> "-" in the tag is ugly
09:17:21  <planetmaker> ?
09:17:28  <planetmaker> should I use space?
09:17:30  <Ammler> but well
09:17:41  <Ammler> no, that is even uglier, is that possible?
09:17:52  <planetmaker> dunno. But I don't want to try even
09:33:18  * andythenorth has to go out in a short while
09:33:23  <andythenorth> planetmaker: you around later?
09:34:26  <planetmaker> maybe :-) But I'll watch soccer today for sure, so I don't know quite when
09:34:48  <planetmaker> later is quite vague :-P
09:38:26  *** Seberoth has joined #openttdcoop.devzone
09:39:47  <Ammler> football*
09:40:12  <planetmaker> :-) quite true
09:43:28  <Brot6> #openttdcoop - Feature #1063: compiling nightlies with branchy repos (planetmaker) @
09:43:52  <planetmaker> Ammler: how is the CF updated?
09:44:02  <planetmaker> is it sufficient to update the repo or is other action needed?
09:44:03  <Ammler> hg up
09:44:19  <Ammler> you need to run hg up serverside
09:44:56  <planetmaker> oh... andythenorth: another thing I just noticed: it makes sense to submit all patches to the default branch
09:45:05  <planetmaker> And then only backport to the 0.3 branch what you want there.
09:45:07  <Ammler> but your patch is useless, isn't
09:45:14  <Ammler> thought, we discussed that already :-)=
09:45:20  <planetmaker> You did it now vice versa with the parameters patch...
09:45:29  <planetmaker> Ammler: it's not?
09:45:36  <planetmaker> you use hg tip
09:45:39  <planetmaker> which is wrong
09:45:44  <planetmaker> you have to use hg parent
09:45:56  <Ammler> hmm, that is the same after hg clone
09:46:00  <planetmaker> nope
09:46:05  <planetmaker> only for non-branchy repos
09:46:12  <planetmaker> not if tip is in a branch
09:46:28  <planetmaker> like for firs now
09:47:06  <Ammler> but then firs is making something wrong, you like to support that?
09:47:17  <planetmaker> firs is not doing something wrong
09:47:21  <planetmaker> tip is always the last commit
09:47:39  <Ammler> which should make the nightly, shouldn't?
09:47:45  <planetmaker> nope
09:47:55  <planetmaker> The nightly should be the last commit to the default branch
09:48:18  <Ammler> hmm
09:48:35  <planetmaker> and the attached patch makes sure that it is.
09:48:37  <Ammler> ok,
09:48:46  <planetmaker> using tip is not a good idea in branchy repos
09:48:50  <planetmaker> it can be anywhere
09:49:13  <Ammler> why does firs branch?
09:49:23  <Ammler> something experimental?
09:49:29  <planetmaker> get out a release NOW and have foobar do cool stuff concurrently
09:49:49  <Ammler> but then the release should be the branch, imo
09:49:53  <planetmaker> it is
09:49:59  <planetmaker> 0.3 is the branch
09:50:08  <planetmaker> and default is the development thing
09:50:14  <Ammler> ah, ok :-)
09:50:37  <planetmaker> :-)
09:51:06  <Ammler> maybe we need to change the build scripts too
09:52:48  <Ammler> but r1013-1016 are also in 0.3 branch
09:53:33  <planetmaker> they're currently only there. That's IMHO a mistake
09:53:38  <planetmaker> But all else is fine
09:53:45  <planetmaker> I just port them over to default
09:53:57  <Ammler> and why is 0.3 merged back to default?
09:54:32  <Ammler> so currently default and 0.3 is the same again?
09:54:54  <Ammler>
09:55:26  <Ammler> hmm, no
09:55:28  <planetmaker> nearly
09:55:38  <planetmaker> I'll skip the white space mess :-P
09:55:40  <Ammler> are you sure, this is correct?
09:55:52  <planetmaker> I'll transplant andy's first 0.3 commit
09:55:56  <planetmaker> and all will be fine
09:56:19  <planetmaker> then both have currently the same state again.
09:56:19  <Ammler> :-)
09:56:30  <planetmaker> But default will get more which won't be backported
09:56:53  <planetmaker> hm, transplant was too easy :-)
09:56:57  <Brot6> FIRS Industry Replacement Set - Revision 1017:2e0927b4b5bf: Change: experimental code for product... (andythenorth) @
09:57:43  <andythenorth> planetmaker: so we develop in default, and backport some of that to 0.3?
09:57:51  <planetmaker> exactly
09:57:54  <andythenorth> rather than develop 0.3 and merge that with default?
09:58:02  <planetmaker> so I do advise to always work on default
09:58:13  <andythenorth> saves me having to remember to switch.  I was worried about that :P
09:58:13  <planetmaker> and only later cherry-pick what you want to go into 0.3
09:58:32  *** dan123 has joined #openttdcoop.devzone
09:58:46  <planetmaker> I mean... you want the parameter stuff in 0.4, too, don't you?
09:59:39  <planetmaker> andythenorth: but it should give you good incentive to make the patches small.
09:59:54  <planetmaker> Small patches which only change one thing, make it easy to transplant them to the 0.3 branch
09:59:57  <andythenorth> planetmaker: yes everything from 0.3 should go into 0.4
10:00:05  <andythenorth> and yes we'll have to develop carefully
10:00:12  <planetmaker> yeah, then doing everything in default is the sane thing
10:00:14  <andythenorth> I (mostly) try to keep patches atomic
10:00:25  <planetmaker> :-) I know. And you do a good job so
10:00:45  <planetmaker> Just wanted to stress its importance increase once you started with branches and backports :-)
10:02:19  <planetmaker> I don't have experience with that so far either. It'll be interesting :-)
10:04:13  <Brot6> firs: abort: push creates new remote branches: 0.3!
10:04:43  *** KenjiE20 has joined #openttdcoop.devzone
10:05:15  <Ammler> how did you push?
10:05:28  <Ammler> did you need to force?
10:06:52  <Ammler> schouldn't you also make a branch for experimental code?
10:07:17  <Ammler> default should have only "buildable" code
10:08:56  <planetmaker> Ammler: 'experimental' which doesn't build doesn't belong to the public repo
10:09:14  <planetmaker> that's for the author to first make sure s/he doesn't push crap. As always
10:09:19  <Ammler> then the word experimental doesn't belong to the commit message :-P
10:10:23  <planetmaker> Oh, it can. If it works but needs testing
10:11:15  <Ammler> we need to check, how easy it is to support building other branches
10:12:29  <Ammler> any idea, why backup push didn't work?
10:13:58  <andythenorth> Ammler: we don't push code that breaks the build
10:14:02  <andythenorth> or we try not to anyway :P
10:14:13  <Ammler> andythenorth: you could in a branch
10:14:20  <planetmaker> Ammler: branches add a new head
10:14:29  <planetmaker> and pushing new heads need forcing the push
10:14:36  <Ammler> hmm
10:15:08  <Ammler> I could simply always force
10:15:18  <andythenorth> quite often I push code which is unfinished but doesn't break anything, then you'll see 'experimental' in my commits
10:15:21  <andythenorth> for example
10:15:37  <andythenorth> there's no point adding too many branches, it's just extra complexity
10:20:32  <Brot6> FIRS Industry Replacement Set - Feature #1064 (New): Consider increasing the number of farms / fa... (andythenorth) @
10:20:42  *** dan123 has quit IRC
10:20:50  <Terkhen> hmm... are you planning to add features that include new strings to 0.3? or can I safely ignore that branch while translating?
10:21:09  <planetmaker> [Generating] <-- like that for branches?
10:21:32  <planetmaker> Terkhen: in case of doubt: always ignore it
10:21:38  <planetmaker> and... it's not different now
10:21:47  <Ammler> planetmaker: when it has a tag?
10:21:52  <Terkhen> okay :P
10:22:02  <planetmaker> Ammler: no :-) That's just buidling a branch version
10:22:15  <Ammler> how does it look with a tag?
10:22:23  <andythenorth> Terkhen: ignore 0.3
10:22:29  <andythenorth> it's parameters only
10:22:29  <planetmaker> Ammler: same as before
10:22:36  <Terkhen> ok
10:22:40  <planetmaker> With tags I ignore the branch and just use the tag for name generation
10:22:55  <planetmaker> [Generating] <-- like that
10:23:38  <Ammler> ok, well, there won't be untagged releases of 0.3 branch, I assume
10:23:55  <planetmaker> I don't think so. At least nothing I planned for so far
10:24:11  <planetmaker> Nor do I think we really need them. For now at least
10:24:35  <planetmaker> otherwise... I do propose a possible change to the CF:
10:24:58  <planetmaker> next to releases it could contain not 'nightly' but 'default' or other branch names. And it builds then those
10:25:15  <planetmaker> transitionally 'default' and 'nightly' could be considered the same
10:28:00  <Brot6> #openttdcoop - Bug #1063: compiling nightlies with branchy repos (Ammler) @
10:28:00  <Brot6> #openttdcoop - Bug #1063: compiling nightlies with branchy repos (planetmaker) @
10:28:00  <Brot6> #openttdcoop - Bug #1063: compiling nightlies with branchy repos (Ammler) @
10:28:32  <Ammler> oh, change Tracker causes spam :-)
10:29:44  <Ammler> nightly does tell you when it will be build
10:30:13  <planetmaker> hm?
10:30:25  <Ammler> I think, you don't need to link nightly with default or releases with tags
10:31:00  <planetmaker> Well, I mean, if only 'releases' is special (which builds the tags), the other build targets could be named like branches
10:31:08  <Brot6> #openttdcoop - Revision 75:5dd1e7e20c86: Fix: use parent instead of tip in order to get the lates... (planetmaker) @
10:31:08  <Brot6> #openttdcoop - Bug #1063 (Closed): compiling nightlies with branchy repos (planetmaker) @
10:31:09  <planetmaker> Then each branch name mentioned could get a nightly build
10:32:16  <Ammler> ah, you mean with enabling like .devzone/build/0.3/enable
10:32:44  <planetmaker> yes
10:32:49  *** Seberoth2 has joined #openttdcoop.devzone
10:33:21  <planetmaker> shall I make a ticket? :-)
10:33:53  <Brot6> Example NewGRF Project - Revision 109:74655c4f9382: Feature: Support repositories with branches (planetmaker) @
10:35:15  <Ammler> planetmaker: did you update on the server?
10:35:25  <planetmaker> I only pushed
10:36:20  <Ammler> planetmaker: imo, you should get rid of "nightly" on the makefile at least
10:36:29  *** Seberoth has quit IRC
10:36:42  <planetmaker> Ammler: I made it now a makefile setting
10:36:49  <planetmaker> I still left 'nightly' the default, though
10:37:04  <planetmaker> so the files for the default-branch are names as now
10:37:08  <Ammler> only the CF should make nightly
10:37:17  <planetmaker> hm
10:37:22  <Ammler> _if_
10:37:30  <planetmaker> point taken
10:37:54  <planetmaker> so... no branch name for default, neither nightly nor default - unless specifically required?
10:37:55  <Ammler> was calls it dev
10:38:07  <planetmaker> no need for dev either
10:38:23  *** Seberoth has joined #openttdcoop.devzone
10:39:29  <planetmaker> hm.
10:39:37  <planetmaker> OpenTTD doesn't add any 'nightly' or alike
10:39:49  <planetmaker> it just reports the revision for default branch. That's it.
10:39:53  <planetmaker> Whereever it is compiled
10:40:30  <planetmaker> and... I'm not sure I like it, if the default compile result from the same sources is different when compiled here and on the CF
10:40:45  <planetmaker> it makes sanity checks more difficult
10:41:00  <planetmaker> and gives rise to errors (e.g. wrong version uploaded to bananas)
10:42:22  <Brot6> #openttdcoop - Feature #1065 (New): Support nightly builds for branches (planetmaker) @
10:43:46  <Ammler> planetmaker: hg 1.6 has new option --new-branch
10:49:24  <andythenorth> :o I had completely forgotten about grf crawler
10:49:36  * andythenorth wonders if people still use grf crawler
10:49:39  * andythenorth has to go out
10:49:43  <andythenorth> bye - see you later :)
10:52:49  <Ammler> mostly, when I try to edit something there, it doesn't work
10:54:36  <Ammler> [12:40] <planetmaker> and... I'm not sure I like it, if the default compile result from the same sources is different when compiled here and on the CF <-- how does that happen?
11:07:27  <planetmaker> Ammler: it does if the version is stored in the grf.
11:07:30  <planetmaker> which it is
11:07:55  <Ammler> oh, I didn't mean, we should name the CF builds something other
11:08:14  <Ammler> also the nightlies don't need nightly in the name :-)
11:08:21  *** FooBar_ has joined #openttdcoop.devzone
11:08:35  <planetmaker> what do you want to change then, if not the name created here or by the CF?
11:08:47  <Ammler> nothing
11:08:55  <Ammler> all up to the makefile
11:12:58  <planetmaker> eh?
11:13:08  <planetmaker> how does the makefile know who calls it?
11:13:36  <planetmaker> [12:37]	<Ammler>	only the CF should make nightly <-- I referred to that
11:14:08  <Ammler> yes, but not name those something else as when you compile the same rev
11:24:16  <Brot6> FIRS Industry Replacement Set - Bug #1066 (Confirmed): changelog.txt not added to bundle (planetmaker) @
11:24:53  <planetmaker> Ammler: so... we drop the 'nightly' entirely?
11:25:05  <Ammler> hmm
11:25:17  <planetmaker> just firs-r204240
11:25:27  <planetmaker> dunno
11:25:39  <Ammler> the "r" does imply develoment :-)
11:26:51  <FooBar_> guys, you have time for a little help with the makefile? I'm not done trying all different options, but now I've removed mingw/msys and installed Luna C/C++ instead and updated grep. Now again I get as far as "No rule to make target firs.grf"...
11:27:49  <Ammler> the repo is completely vanilla?
11:28:53  <FooBar_> yes, I actually did a new clone
11:29:14  <Ammler> I assume, you miss some tools in $PATH?
11:29:41  <FooBar_> It does create the REV file and Makefile.dep
11:29:56  <planetmaker> FooBar_: try to run it with make _V=
11:30:13  <planetmaker> and post the output
11:30:21  <FooBar_> alright
11:31:20  <FooBar_> D:\TTD\grf-dev\firs>make _V=
11:31:22  <FooBar_> make  -f Makefile firs.grf
11:31:23  <FooBar_> make[1]: Entering directory `/d/TTD/grf-dev/firs'
11:31:25  <FooBar_> make[1]: *** No rule to make target `firs.grf'.  Stop.
11:31:26  <FooBar_> make[1]: Leaving directory `/d/TTD/grf-dev/firs'
11:31:28  <FooBar_> make: *** [all] Error 2
11:32:05  <Rubidium> huh... what is make doing there?
11:32:21  <Rubidium> it smells like a messed up makefile to me
11:32:37  <planetmaker> eh...
11:32:38  <Brot6> FIRS Industry Replacement Set - Revision 1018:8724dc47957e: Fix [#1066]: Changelog was not shipped (planetmaker) @
11:32:38  <Ammler> don't you need to run make in cygwin?
11:33:09  <Ammler> ah, you use luna
11:33:18  <FooBar_> I didn't have to last year... Yes, luna
11:33:27  <planetmaker> eh...
11:34:05  <planetmaker> that looks strange...
11:34:52  <FooBar_> I'm looking into getting cygwin though, because if that works then I can probably live with that.
11:35:03  <Rubidium> having said that... I've just built a "fresh" luna thingy, so I should be able to reproduce it
11:35:48  <planetmaker> FooBar_: you miss at least something like this:
11:36:05  <planetmaker> do you have by any chance already a bogus Makefile.dep sitting around? And / or a Makefile.REV?
11:36:25  <planetmaker> not Makefile.REV but firs-.... REV
11:36:32  <FooBar_> well, let me try again then after clean
11:36:34  <planetmaker> if so... delete them
11:38:16  <FooBar_> ah yes, now I get something like yours. Not done yet though
11:40:42  <FooBar_> planetmaker:
11:42:24  <planetmaker> FooBar_: and what does the Makefile.dep look like?
11:43:03  <FooBar_> planetmaker:
11:46:25  *** frosch123 has joined #openttdcoop.devzone
11:47:28  *** dan123 has joined #openttdcoop.devzone
11:47:44  <planetmaker> if I knew...
11:48:30  <Rubidium> I must say that I'm amazed by the enormous amount of time spent spawning processes
11:48:39  <planetmaker> FooBar_: try 'make firs.nfo'
11:48:56  <FooBar_> ok, here goes
11:49:08  <FooBar_> I don't need to clean first, do I?
11:49:18  <planetmaker> you shouldn't need it. The dep file looks ok
11:49:30  <planetmaker> do you have an nfo generated already somewhereß
11:49:32  <planetmaker> ?
11:49:34  <Ammler> FooBar_: since you left, nobody is building with windows anymore, so we are completely out of experience ;-)
11:49:52  <FooBar_> yeah, I was afraid of that...
11:50:27  <Rubidium> oh... depchecking firs in vbox in windows is only 60 times slower than building under linux
11:50:29  <Ammler> hmm, except yexo with cygwin
11:50:51  <planetmaker> only :-)
11:51:22  <planetmaker> iirc hirundo also uses windows. But not quite sure
11:51:46  <FooBar_> I'm confused by Cygwin... so many options...
11:51:58  <planetmaker> options?
11:52:09  <planetmaker> when I once installed it, that was it and fine...
11:52:14  <FooBar_> yeah, what packages to download and what not
11:52:20  <planetmaker> but looong time ago :-)
11:52:26  <FooBar_> I'm going to try the default...
11:52:39  <FooBar_> Oh, by the way: make: *** No rule to make target `firs.nfo'.  Stop.
11:52:54  <planetmaker> right
11:53:03  <planetmaker> what does hg diff tell you?
11:53:09  <planetmaker> you have a modified repo
11:53:33  <FooBar_> It gives me a lot
11:53:41  <planetmaker> well. Try unmodified maybe?
11:53:45  <planetmaker> For a starter?
11:53:51  <Rubidium> the firs.grf failing happens for me too
11:53:52  <FooBar_> I wonder how I can have a modified repo: I did a new clone
11:54:05  <planetmaker> hg revert -a
11:54:15  <planetmaker> FooBar_: hm... line endings?
11:54:26  <FooBar_> I'm starting to think that
11:54:30  <planetmaker> uh... for you, too, Rubidium ?
11:54:32  <planetmaker> hm
11:55:00  <FooBar_> revert gives me these kind of things
11:55:02  <FooBar_> WARNING: templates/template_secondary_action23_B.pnfo already has CRLF line endings
11:55:11  <FooBar_> So I guess that indeed might be the problem...
11:55:13  <Rubidium> VPATH/Repository dirs are empty
11:55:18  <Rubidium> (in make test)
11:55:25  <planetmaker> ^ that's bad. It needs them
11:56:47  <planetmaker> dirname probably missing
11:56:54  <Ammler> FooBar_: you use the win32text extension?
11:56:54  <planetmaker> as shell command
11:57:03  <FooBar_> Ammler: yes
11:57:14  <Ammler> that is outdated recently :-)
11:57:20  <Ammler> I would recommend to trash it
11:57:28  <planetmaker> FooBar_: Rubidium do you have dirname available in shell?
11:57:39  <Ammler> and use
11:57:40  <Webster> Title: EolExtension - Mercurial (at
11:57:43  <FooBar_> I have dirname
11:57:47  <planetmaker> hm, ok
11:59:02  <planetmaker> <-- try 'make test' and what it gives
12:01:10  <FooBar_> ok, is running
12:02:23  <Rubidium> argh... some lines of code to dump the path and there... make test forces a rebuild of makefile.dep
12:02:30  <Rubidium> bye 3 minutes
12:02:57  * planetmaker installs parallels
12:02:58  <FooBar_> planetmaker:
12:03:15  <Rubidium> that looks seemingly familiar
12:05:34  <planetmaker> FooBar_: in the console: what does 'hg st -A | grep -v  "^I" | grep -v "^?" | grep -v "^R" | grep -v "^\!" | cut -d\  -f2' give you?
12:06:09  <Rubidium> planetmaker: that seems to work correctly for me
12:06:11  <FooBar_> a lot more than can fit into it. I have to put it in a file
12:06:20  <Rubidium> I used -v "^[I?R]" though
12:06:21  <planetmaker> that was hoped
12:06:50  <planetmaker> well... that line is a copy from the Makefile, but yes, it could probably be abbreviated.
12:07:01  <FooBar_> this is everything:
12:07:32  <planetmaker> uh?
12:07:51  <planetmaker> let's see...
12:08:07  <Rubidium> that looks wrong
12:08:11  <Rubidium> for me it looked right
12:08:29  <planetmaker> FooBar_: that looks quite wrong
12:08:39  <FooBar_> good. What's wrong?
12:08:49  <planetmaker> all output you pasted for that line
12:09:27  <FooBar_> what should it be then?
12:09:43  <Rubidium> I hope something like (which is what I get)
12:09:44  <planetmaker>
12:10:05  <FooBar_> I see. It's missing the dirnames
12:10:20  <FooBar_> and filenames for that matter
12:10:39  <Rubidium> FooBar_: did you copy or type it yourself?
12:11:10  <FooBar_> I saved the output to a text file using > text.txt at the end and copy/pasted that
12:11:40  <FooBar_> But the console output is the same, just not complete
12:11:47  <planetmaker> hm... mind that the "cut -d\  -f2" has two spaces after the \
12:12:11  <FooBar_> oh that, yes, I copied that as well..
12:12:25  <FooBar_> and only one space resulted...
12:13:18  <Rubidium> heh... at REPOS_FILES ?= ... pwd is "correct path - 1"
12:13:23  <FooBar_> still the same though, with or without the 2 spaces
12:13:29  <Rubidium> i.e. the parent of the correct path
12:13:48  <planetmaker> hu @ Rubidium ?
12:14:10  <Rubidium> planetmaker: somewhere the path is changed
12:14:35  <planetmaker> that's not good
12:15:16  <FooBar_> I'm running a make remake from cygwin now
12:17:14  <FooBar_> interesting warning: ms-dos style path detected: sprites\nfo\lang_german.pnfo
12:20:02  <FooBar_> And again no make target 'firs.grf'... :(
12:20:28  <FooBar_> I'm off eating something now. Will be back later
12:20:49  <Rubidium> planetmaker: what's the idea of ?= in make? How/when does it get evaluated?
12:22:55  <planetmaker> Rubidium: it assignes a value if none is assigned previously
12:23:08  <planetmaker> thus it allows to have user-settings overwrite the defaults
12:23:20  <planetmaker> e.g. Makefile.local to take precedence
12:23:30  <planetmaker> or command line parameters
12:23:57  <planetmaker> *assigns
12:24:31  <planetmaker> actually. It sets the parameter, if it is not *defined* previously
12:24:38  <planetmaker> empty definition will not be over-written
12:24:44  <planetmaker> IIRC
12:26:58  <planetmaker>
12:26:59  <Webster> Title: Makefile variable assignment - Stack Overflow (at
12:29:29  <planetmaker> <-- manual
12:29:30  <Webster> Title: GNU `make' (at
12:29:59  <planetmaker> they're evaluated only when used. Same as = as opposed to := which assigns a value where that assignment is made
12:37:08  * Rubidium thinks he just found his cluestick
12:39:02  *** FooBar_ has quit IRC
12:42:59  <planetmaker> :-)
12:48:03  <Rubidium> seems like my cluestick is right
12:48:30  *** FooBar_ has joined #openttdcoop.devzone
12:48:51  <Rubidium> planetmaker: for i in a\b\c.nfo b\c\d.nfo; do dirname $i; done
12:48:59  <FooBar_> back, I also installed the newest version of Hg, so now to try this eol extension...
12:49:12  <planetmaker> outch
12:49:40  <Rubidium> ah... this looks better
12:50:27  <planetmaker> do you have a solution?
12:50:50  <Rubidium> <- that... but as of yet untested
12:51:04  <Rubidium> remember, make test already takes 3-4 minutes
12:52:13  <planetmaker> disgusting time spans...
12:52:46  <planetmaker> but then it runs all initialization, too
12:53:18  <Rubidium> hmm... that diff gives unterminated escapes...
12:56:34  <planetmaker> isn't it just sed "s@\@/@/g" ?
12:57:59  <planetmaker> though... it works in my bash
12:57:59  *** FooBar_ has quit IRC
12:58:20  <Rubidium> nah, because it's used as param later, so you need to escape that
12:58:44  *** FooBar_ has joined #openttdcoop.devzone
12:59:03  <planetmaker> hm? \ escapes it, doesn't it?
12:59:12  <Rubidium> and an unterminated command in a sed expression mean that it's not escaped enough
12:59:36  <Rubidium> and with \\ it's an unterminated command
12:59:39  <planetmaker> but you're right. It needs 4 \\
12:59:50  <planetmaker> it's not unterminated here
13:00:23  <Rubidium> cargos.pnfo isn't generated
13:02:04  <planetmaker> try hg st -A | grep -v  "^I" | grep -v "^?" | grep -v "^R" | grep -v "^\!" | cut -d\  -f2 | sed 's@\\@\/@g'
13:02:13  <planetmaker> escape the / , too
13:03:08  <Rubidium> does the / need to be escaped?
13:03:45  <planetmaker> hm... maybe... not sure, if you use @ as separator
13:04:02  <planetmaker> "s/\\/\//g" :-P
13:08:39  <planetmaker> hm... damn... I don't find my license key for parallels :S
13:09:24  <Rubidium> it's totally screwed up in any case... for some reason it fails to generate the two pnfos... but that can be caused by me "disabling" it for a while
13:14:07  <planetmaker> they're generated by some scripts... maybe some of the commands therein fail?
13:14:38  <Rubidium> unlikely as generating them "by hand" works just fine
13:15:26  <Rubidium> I think it's just one huge ginormous mess of dos path separators that's bugging it completely
13:16:21  <Rubidium> and I can't be bothered to root them all out; installing a proper mingw is already harder than installing virtualbox with ubuntu
13:16:37  <Rubidium> so, vbox + ubuntu is probably the better way of "compiling" on windows
13:22:42  <planetmaker> :-D
13:24:11  <FooBar_> great...
13:26:23  <FooBar_> And then putting Photoshop in wine...
13:27:12  <planetmaker> :-)
13:27:23  <planetmaker> that's of course not needed
13:27:34  <planetmaker> if you have a transparent file access
13:28:06  <FooBar_> Anyways, I tried again with a fresh Hg, a fresh clone, the eol extension, making sure that there are no files changes and then both msys and cygwin fail on me
13:29:31  <planetmaker> it used to work for me with mingw
13:29:47  <FooBar_> It used to work for me with mingw/msys too
13:29:50  <FooBar_> way back that is
13:30:18  <planetmaker> ok, I'll be back a bit later. I'll try it on my old disk with the old mingw. Rebooting
13:30:27  <FooBar_> ok
13:41:41  *** welshdragon has left #openttdcoop.devzone
13:44:26  *** FooBar_ has quit IRC
13:46:33  *** welshdragon has joined #openttdcoop.devzone
13:47:24  <planetmaker> hmpf
13:51:44  *** frosch123 has quit IRC
13:58:48  *** FooBar_ has joined #openttdcoop.devzone
14:04:14  <Brot6> firs: abort: push creates new remote branches: 0.3!
14:05:26  <planetmaker> seems I activated TV just in time :-)
14:11:07  <Ammler> not the nicest goal
14:11:26  <Brot6> #openttdcoop - Revision 76:d26113cfe274: [HG] Fix: force push for backup, so new branches will be... (Ammler) @
14:11:26  <Brot6> #openttdcoop - Revision 77:bab0d29d3e1f: [Compiler] Fix: force rebuild on manual building (Ammler) @
14:11:26  <Brot6> #openttdcoop - Revision 78:66f98f3c85c3: [Compiler] Add unix2dox to the buildrequires (Ammler) @
14:12:47  * andythenorth back
14:14:23  * welshdragon sighs
14:14:37  <welshdragon> #openttd never gives straight answerd
14:14:40  <welshdragon> *answers
14:17:09  <Ammler> you don't get better answers here :-P
14:17:46  <welshdragon> haha
14:18:06  <welshdragon> I was hoping you'd reply to my question Ammler
14:18:17  <welshdragon> seeing as you are one of the devs for ap-
14:18:22  <Ammler> I just joined
14:18:45  <Ammler> I am not really a dev, just committing some useful things for #openttdcoop
14:18:53  <welshdragon> aah
14:19:07  <Ammler> and keep it working until there is a better wrapper... :-)
14:19:08  <welshdragon> 'welshdragon: I'm using AP+ on my server, Where do I put data files? In /ap+ or in ./OpenTTD?'
14:19:31  <Ammler> isn't that the same?
14:19:34  <welshdragon> :P
14:19:54  <welshdragon> they're two different directories
14:20:14  <Ammler> i am in #openttd too
14:20:17  <welshdragon> and I keep trying to load a game, but the GRF's are missing :/
14:20:21  <welshdragon> aah
14:20:23  <welshdragon> :P
14:26:16  * andythenorth ponders some code
14:26:28  <andythenorth> FooBar_: planetmaker football / tennis / FIRs code? :)
14:26:40  <andythenorth> or alternatively: nap time
14:27:04  <planetmaker> well... I gotta watch football right now :-)
14:27:05  <FooBar_> I like nap time. I'm tired of getting make to work
14:28:59  <planetmaker> my problem was the -o wasn't recognized as an option for my grep
14:29:22  <FooBar_> and a new grep fixed it for you?
14:29:29  <FooBar_> because here it didn't...
14:30:01  * andythenorth ponders posting FooBar_ a virtual machine
14:30:16  <planetmaker> FooBar_: I don't quite know
14:30:37  <planetmaker> running all system from an external HDD kinda sucked...
14:31:44  <Ammler> needing a vm just to build would suck
14:32:28  <FooBar_> Windows Virtual Machine also sucks; I tried installing both Xubuntu and Ubuntu, and it just quits without warning
14:33:18  <Ammler> well, you should use vbox then
14:33:37  <andythenorth> Ammler: I've still got Crossover (Wine) handling renum for some of my grf builds
14:33:49  <andythenorth> the mac version works now, I just haven't got around to changing it :)
14:34:13  <Ammler> andythenorth: yes, but I remember it sucked :-)
14:34:34  <andythenorth> it works just fine, but it's....untidy :)
14:34:50  <FooBar_> that is vbox as in virtualbox? As that's what Google offers me :)
14:35:01  <Ammler> yes
14:36:15  <Ammler> if you really like to use linux, you should consider to install it natively
14:36:34  <Ammler> and maybe run then windows in a vbox :-)
14:36:41  <FooBar_> lol
14:36:57  <FooBar_> No, I have to have windows due to AutoCAD
14:37:09  <FooBar_> Not so fun to run /that/ virtually
14:37:28  <FooBar_> Germany just got lucky :)
14:37:29  <Ammler> well, I still have windows on a 2nd bootoption too
14:38:10  <FooBar_> Thing is, I don't like rebooting. Always use hibernate and only reboot if some install requires me to do so
14:39:27  <FooBar_> We'll see if this virtualbox works
14:40:18  *** FooBar__ has joined #openttdcoop.devzone
14:42:31  <Ammler> FooBar__: you tried cygwin?
14:42:47  <FooBar__> yes, didn't work either
14:43:12  <Ammler> maybe you could try another repo?
14:43:21  <FooBar__> sure, any suggestions
14:43:23  <FooBar__> ?
14:43:24  <Ammler> opengfx for example
14:43:27  <FooBar__> ok
14:46:45  *** frosch123 has joined #openttdcoop.devzone
14:47:45  *** FooBar_ has quit IRC
14:50:19  <FooBar__> *** No rule to make target `ogfx1_base.grf', needed by `opengfx.obg'.
14:50:57  <FooBar__> Ammler: that's the same type of error I get with FIRS
14:51:04  <FooBar__> I'll try cygwin now, just to see
14:54:40  <Ammler> well, that is the need of newer grep I assume?
14:55:14  <Ammler> cygwin has the newer grep?
14:55:24  <FooBar__> I updated mingw/msys grep too
14:56:06  *** dan123 has quit IRC
14:57:50  <FooBar__> same error on cygwin
14:58:15  <andythenorth> :(
15:02:02  <FooBar__> you can say that again
15:03:01  <FooBar__> as long as make doesn't work, coding is a bit difficult as I can't test it
15:03:40  *** dan123 has joined #openttdcoop.devzone
15:07:27  <andythenorth> grr
15:07:51  <andythenorth> FooBar__: what changed since last time you were FIRS dev?
15:08:09  <FooBar__> the makefile
15:08:11  <andythenorth> what happens if you remove the dependency checks?
15:08:51  <FooBar__> where do I find those?
15:11:43  <andythenorth> not sure
15:11:45  <andythenorth> planetmaker: ^
15:11:45  <andythenorth> ?
15:12:12  <planetmaker> FooBar__: Makefile.common
15:12:17  <planetmaker> Look for the target depend:
15:12:27  <planetmaker> replace it by touch Makefile.dep
15:13:53  <FooBar__> done that
15:15:11  <FooBar__> crap, not entirely...made an error somewhere
15:20:24  <FooBar__> nope, still "*** No rule to make target `firs.grf'.  Stop."
15:23:47  <andythenorth> boo
15:29:56  <Ammler> well, yexo has a working windows framework
15:30:04  <Ammler> maybe he has some tips
15:31:19  <Yexo> not really, it's a lot of work to get a working environment and since I have it working I touch it as little as possible to avoid breaking it
15:32:05  <Ammler> can't you just "clone" it? ;-)
15:32:07  <andythenorth> :|
15:32:24  <FooBar__> I think you can just zip the folder and that I can use it.
15:32:42  <FooBar__> As long as it's 32 bit and I add the correct path strings
15:33:13  <Yexo> my installation is a mess
15:33:21  <planetmaker> FooBar__: you need to delete Makefile.dep
15:33:28  <Yexo> considering I also have msys and I'm not even sure hwere all the binaries come from
15:34:31  <Ammler> then a linux in a vbox might indeed be not that bad :-)
15:34:34  <FooBar__> planetmaker: I've done that numerous times, but I can try again though
15:34:55  <Ammler> just "share" the working dir
15:35:13  <FooBar__> Ammler: I have that now and shared a dir, but I cannot find that anywhere in Xubuntu
15:35:25  <planetmaker> oh, ok. I just thought after the dep check was removed
15:36:16  <Ammler> FooBar__: how you share?
15:36:28  <FooBar__> devices > shared folders
15:36:48  <FooBar__> And there I added my complete D-drive
15:37:38  <FooBar__> then I rebooted Xubuntu and I'm expecting to see "D_DRIVE" somewhere in the file manager
15:37:47  <FooBar__> but I don't see it there
15:38:25  <Ammler> FooBar__: did you install the guest addons?
15:38:36  <FooBar__> the what now?
15:38:52  <Ammler> guest addons in the linux client
15:38:58  <FooBar__> then no
15:39:04  <Ammler> it needs to load a special kernel modul
15:39:15  <Ammler> else you could also simply mount a windows share
15:39:23  <Ammler> with smb://...
15:39:37  <Ammler> or cifs
15:40:20  <Ammler> vbox should have a menu button to install the addons
15:40:27  <FooBar__> or someone just fixes the make file ;)
15:40:31  <FooBar__> But let me see...
15:40:55  <Ammler> well, that can now happen, since we have back a windows dev :-P
15:41:18  <FooBar__> great! I'd really appreciate that
15:41:26  <FooBar__> found the guest addons
15:41:46  <Ammler> that should install a kernel module
15:42:46  <Ammler> might help
15:42:48  <Webster> Title: Ubuntu 7.04 - How do i mount a shared folder? (View topic) • (at
15:42:58  <FooBar__> well, it gave a window which at the end said "press enter to close window" so I did that
15:43:27  <Ammler> lsmod | grep vboxvfs
15:43:42  <Ammler> modprobe vboxvfs
15:44:05  <Ammler> mount -t vboxsf share /home/bba/Download/share/
15:44:37  <Ammler> and for generic linux question, you get enough help here
15:45:36  <Ammler> in the time you tried to get make running, you could have coded a new set!
15:46:00  <Ammler> crazy Germany
15:46:08  <FooBar__> I see... 4-0
15:58:45  * planetmaker installs windowsXP in virtualBox
16:01:30  * andythenorth draws some boats and hopes for an answer to FooBar__ 's problems :o
16:03:04  * planetmaker donates another "_" to FooBar__ :-P
16:03:28  <FooBar__> thanks, but I have plenty :P
16:03:39  <FooBar__> by the way, congrats on the 4-0 victory!
16:03:43  <planetmaker> :-)
16:04:31  <FooBar__> I made a wild guess yesterday after "we" won: final game: Netherlands - Germany
16:05:00  <FooBar__> Unfortunately, I also made the guess that Germany will win...
16:06:03  <Ammler> I bet against Holland :-)
16:07:57  <FooBar__> I don't seem to be able to mount the shared folder
16:08:13  <FooBar__> gives me "No such device" error
16:08:20  <Ammler> mount it as samba then
16:08:31  <Ammler> you ran the commands I pasted?
16:08:43  <FooBar__> yes, that didn't work either
16:08:52  <Ammler> lsmod | grep vboxvfs ?
16:08:55  <FooBar__> I forgot why, so let me try
16:09:27  <Ammler> since I don't use windows at all anymore
16:09:33  <FooBar__> the lsmod thing does noting (visible)
16:09:36  <Ammler> I even don't have vbox installed :-)
16:09:40  <FooBar__> *nothing
16:09:46  <Ammler> then you don't have the module installed
16:09:55  <Ammler> modprobe vboxvfs
16:10:00  <Ammler> enabled I mean
16:10:29  <FooBar__> Module vboxvfs not found
16:10:43  <Ammler> yes, so you need to install the addons
16:10:48  <FooBar__> again?
16:10:53  <Ammler> well, once
16:11:04  <Ammler> you might have just mounted the iso
16:11:08  <FooBar__> I already installed those twice
16:11:12  <Ammler> but did you also run the installer?
16:11:18  <FooBar__> no, I also ran the
16:11:24  <Ammler> ok
16:11:35  <Ammler> as root?
16:11:50  <Ammler> you run those commands as root?
16:11:57  <Ammler> su -
16:12:10  <FooBar__> I think I did not do that...
16:12:25  <Ammler> hmm, ubuntu might have no su
16:12:35  <Ammler> so you need to sudo bash first
16:12:38  <FooBar__> It asked for my password though
16:14:50  <FooBar__> it seems it cannot find the sources of my linux kernel
16:15:15  <Ammler> then you might need to install those first: apt-get kernel-source
16:15:25  <Ammler> I have no real idea about ubuntu though
16:15:40  <FooBar__> "invalid operation kernel-source"
16:15:51  <Ammler> apt-get install kernel-source
16:16:25  <FooBar__> how do I become root?
16:16:30  <Ammler> sudo bash
16:16:54  <Ammler> or su -
16:17:07  <Ammler> but afaik, ubuntu doesn't have that
16:17:27  <FooBar__> sudo bash workes, but there doesn't seem to be a package kernel-source
16:17:54  <FooBar__> Luckily, I don't have a clue about linux
16:18:09  <Ammler> well, i don't have a clue about Debian based linux
16:18:26  <Ammler> I prefer rpm
16:18:36  <FooBar__> well, I could try that
16:18:45  <Brot6> heqs: update from r320 to r319 done -
16:18:59  <Ammler> run apt-get help
16:19:03  <Brot6> newgrf_makefile: update from r106 to r96 done -
16:19:16  <Ammler> planetmaker: ^ :-)
16:19:42  <Brot6> swedishrails: update from r123 to r80 done -
16:19:44  <Brot6> Following repos didn't need a nightlies update: 2cctrainset (ERROR r), 32bpp-extra (ERROR r), airportsplus (ERROR r), bros (r12), comic-houses (r70), firs (ERROR r), fish (ERROR r), nml (ERROR r), nmts (ERROR r), nutracks (ERROR r), ogfxplus (r32), opengfx (ERROR r), openmsx (r78), opensfx (r94), snowlinemod (ERROR r), worldairlinersset (ERROR r)
16:19:56  <Ammler> something with parent fails :-(
16:20:48  <FooBar__> well, I have rpm now
16:20:56  <Ammler> which distro?
16:21:22  <Ammler> either yum install kernel-source or zypper install kernel-source :-)
16:21:30  <FooBar__> xubuntu, still, I just apt-getted it
16:21:40  <Ammler> oh
16:21:45  <planetmaker> guestimated install time remaining: 35 minutes... windows is sooo slow :S
16:21:46  <Ammler> don't think, that will help :-P
16:22:32  <Ammler> run apt-get help
16:22:39  <Ammler> there might be a search command
16:22:53  <Ammler> then search for kernel and you will get the name of the source
16:23:11  <Ammler> maybe it is called something else like -devel or -header or whatever
16:23:55  <FooBar__> I don't see anything like a search feature
16:24:21  <Ammler> apt-get search kernel
16:24:47  <FooBar__> no search operation :(
16:24:55  <Ammler> install suse :-P
16:24:58  <Ammler> hehe
16:25:15  <Ammler> or wait for the debian guys
16:25:20  <FooBar__> is that a bit lightweight?
16:25:21  <Ammler> Rubidium:
16:25:47  <Ammler> planetmaker: did you see the nightly compiler output?
16:26:10  <planetmaker> not yet
16:26:53  <planetmaker> looks ok?
16:27:14  <planetmaker> eh... update from r106 to r96?!
16:27:21  <planetmaker> THAT is strange
16:28:21  <FooBar__> well, I give up for today. Maybe I try creating a new makefile step-by-step to find out where the problem lies tomorrow
16:28:34  <FooBar__> if pm hasn't done that by then :)
16:29:00  <Ammler> you could simply run make with target
16:29:10  <Ammler> then you see, on which target it fails
16:30:25  <planetmaker> Ammler: both, grf and nfo fail
16:32:15  <FooBar__> yes, tried that
16:32:15  <planetmaker> Ammler: any idea about what happened to the nightlies?
16:32:20  <Brot6> Following repos didn't need a nightlies update: 2cctrainset (ERROR r), 32bpp-extra (ERROR r), airportsplus (ERROR r), bros (r12), comic-houses (r70), firs (ERROR r), fish (ERROR r), heqs (r319), newgrf_makefile (r96), nml (ERROR r), nmts (ERROR r), nutracks (ERROR r), ogfxplus (r32), opengfx (ERROR r), openmsx (r78), opensfx (r94), snowlinemod (ERROR r), swedishrails (r80), worldairlinersset (ERROR r)
16:32:57  <Ammler> no :-(
16:34:28  <Ammler> planetmaker: I do
16:34:39  <Ammler> there is no parent in a repo without working copy
16:34:41  <Ammler> :-D
16:34:59  <planetmaker> uh... but why did they update to a random revision?
16:35:08  <Brot6> FISH - Revision 381:4574c1ab9660: Change: work in progress - tanker graphics in psd for Island Tr... (andythenorth) @
16:35:22  <planetmaker> so... it needs a hg up <branchname>?
16:35:25  <Ammler> some have a working copy
16:35:28  <planetmaker> ah
16:35:32  <Ammler> when I worked on the server
16:36:02  <planetmaker> yeah... also I might have done that in some
16:36:54  <Ammler> I think, we can still use tip to checkout the repo
16:38:55  <planetmaker> but that's not necessarily the nightly revision we want
16:39:08  <Ammler> well, that wouldn't mean, it does build
16:39:19  <planetmaker> ?
16:39:20  <Ammler> that could be checked later
16:39:31  <Ammler> else we need to mess with the original repos
16:39:35  <Ammler> not sure, I like that
16:40:10  <planetmaker> I thought we are always dealing with a local clone when using the CF?
16:40:41  <Ammler> yes, but the check there is for telling the CF, if it needs to make a clone
16:41:21  <planetmaker> oh. Yes. Then tip is the thing we want to check. I thought it was the revision we use for building
16:42:12  *** dan123 has quit IRC
16:43:35  <Ammler> planetmaker: it is
16:43:53  <Ammler> if you check for example the release build script, it does run hg update
16:44:11  <Ammler> but we might need something like that for nightlies too now
16:44:44  <Ammler> for now, we should revert your commit
16:44:54  <Ammler> and think a bit more about
16:45:47  <Ammler> it doesn't hurt that much
16:46:04  <Ammler> worst what can happen is that the compiler builds the same again
16:47:59  <Ammler> hg up tip doesn't work
16:53:59  <Ammler> how do you switch back from a branch?
16:58:00  <andythenorth> Ammler: hg up default
16:58:12  <Ammler> hg up tip works
16:58:17  <andythenorth> everything is a branch
16:58:23  <Ammler> I didn't see, that firs tip is in branch 0.3
16:58:57  <andythenorth> the red bean hg book is good at explaining branches
17:03:34  <Brot6> FISH - Revision 382:753d8e60b5f5: Feature: tanker graphics, loading graphics for Island Trader (andythenorth) @
17:04:15  <andythenorth> planetmaker: level crossing flashing is trivial.
17:04:23  <andythenorth> I posted the answer in the swedish thread
17:04:57  <Ammler> andythenorth: planetmaker: maybe you make a little wikipage about branches?
17:05:04  <Ammler> specially how to backport
17:05:51  <planetmaker> andythenorth: I answered that there, too ;-)
17:16:05  <andythenorth> I suppose releasing FISH 0.6.1 on the same day as FISH 0.6.0 is silly?
17:16:09  <andythenorth> or not?
17:16:33  <welshdragon> don't release 0.6.0?
17:17:02  <planetmaker> andythenorth: it's not.
17:17:10  <planetmaker> if you've got a good reason
17:17:20  <andythenorth> new graphics
17:18:18  <Ammler> you can release two different versions on same hour :-)
17:19:41  <planetmaker> well, I probably wouldn't do it for "just" a few new graphics. But well. Why not
17:19:59  <Yexo> planetmaker: <- 2ccset and AIs
17:20:01  <Webster> Title: Transport Tycoon Forums • View topic - 2cc locomotive (and rail type) selection (at
17:20:02  <planetmaker> I'd usually do it on the same day only as a kinda urgent bug fix. But that really is just me
17:20:10  <Brot6> fish: update from 0.6.0 to 0.6.1 done (10 errors) -
17:20:12  <Yexo> that might very well also be the reason why admiralai didn't build any trains
17:20:37  <planetmaker> thanks, Yexo
17:20:44  <Brot6> FISH - Revision 383:e8f3085abd50: Change: update changelog preparatory to 0.6.1 (andythenorth) @
17:20:44  <Brot6> FISH - Revision 384:cf251829f567: Added tag 0.6.1 for changeset e8f3085abd50 (andythenorth) @
17:20:50  <Yexo> so simpleai won the "best train AI" by not doing enough checks :p
17:20:56  <planetmaker> :-)
17:21:02  <Yexo> it's quite likely that simpleai will break with the dbset
17:21:20  <Yexo> ^^ saying this without ever having read the simpleai code
17:23:01  <Yexo> do I need to open a ticket for this?
17:23:49  <planetmaker> I just did :-)
17:24:05  <Yexo> ok :)
17:24:23  <planetmaker> That's DJN's stuff to define the properties of engines. He knows them
17:24:41  <Yexo> THIS_ENG_AI_PAXOPTIMIZED is set to 01 in every template
17:24:56  <Yexo> I think 00 would be a more sensible default and then set it to 1 for those engines that are actually pax-only
17:25:26  <Brot6> 2cc train set - Bug #1067 (Confirmed): AI special flag: optimized for passengers set for all engines (planetmaker) @
17:26:54  <planetmaker> yeah, probably
17:27:47  <Brot6> 2cc train set - Bug #1067: AI special flag: optimized for passengers set for all engines (yexo) @
17:28:45  *** FooBar__ has quit IRC
17:30:03  * andythenorth ponders what make next
17:30:55  <Alberth> and you had so many ideas yesterday
17:31:05  <andythenorth> too many ideas
17:31:13  <andythenorth> people with only one idea get stuff done :P
17:31:30  <Alberth> do idea 3
17:31:33  <andythenorth> planetmaker: "abort: crosses branches (use 'hg merge' or 'hg update -C')"
17:31:40  <andythenorth> this is from a pull on HEQS
17:31:54  <andythenorth> bad / or np?
17:32:04  <planetmaker> not good
17:32:07  <andythenorth> poop
17:32:14  <andythenorth> I haven't branched HEQS
17:32:18  <planetmaker> yep
17:32:25  <andythenorth> so I guess the default branches are crossed?
17:32:28  <planetmaker> do a hg up
17:32:33  <planetmaker> and then a hg pull -u
17:32:53  <andythenorth> same error
17:32:58  <Alberth> hg branches
17:33:12  <andythenorth> default                      322:54472eb878b2
17:33:14  <planetmaker> or hg heads
17:33:16  <andythenorth> looks like two
17:33:22  <planetmaker> nope, that's one revision
17:33:32  <Alberth> no idea what 'crosses branches' means
17:33:53  <planetmaker> andythenorth: do you have changes in the heqs repo?
17:34:08  <Alberth> (hg st)
17:34:15  <planetmaker> ^ :-)
17:34:25  <andythenorth> no changes
17:34:42  <planetmaker> so no work which can get lost? hg st is empty?
17:34:42  <andythenorth> hg parents
17:35:08  <andythenorth> hg st is only telling me about unknown files, it's fine
17:35:12  <planetmaker> ok
17:35:14  <planetmaker> hg heads?
17:35:36  <andythenorth>
17:35:55  <planetmaker> if ok. you need to do a merge
17:36:07  <Alberth>
17:36:08  <Webster> Title: Chapter 3. A tour of Mercurial: merging work (at
17:36:20  <andythenorth> merge should be fine in this case
17:36:22  <planetmaker> hg merge -r332
17:38:43  <planetmaker> btw, Ammler, I give up on making a special tar for the grf for OpenGFX
17:38:50  <planetmaker> that's really a pain
17:39:22  <andythenorth> got a HEQS merge conflict....probably need to resolve it manually?
17:39:28  <andythenorth> it's on a single file
17:39:58  <Alberth> yes, look for ===
17:40:38  <Ammler> [19:38] <planetmaker> btw, Ammler, I give up on making a special tar for the grf for OpenGFX <-- fine with me
17:40:47  <Alberth> nice thing about merging with hg is that you get both variants in the file :)
17:40:57  <planetmaker> ^ very much indeed
17:41:13  <Ammler> if someone wants a tar, he can download from
17:41:22  <planetmaker> ok, Ammler, then I'll move the new stuff to all repos and close the ticket :-)
17:41:50  <Ammler> yes, did you revert the commit already?
17:42:08  <planetmaker> nope
17:42:37  <Ammler> shall I?
17:42:39  <planetmaker> I knew I shouldn't touch that repo :-)
17:42:42  <planetmaker> Yes, please
17:42:53  <Ammler> I hope, you will again
17:42:56  <planetmaker> :-)
17:42:58  <Ammler> I should split the repo
17:43:06  <planetmaker> Now that I have a checkout, I might
17:43:12  <Ammler> was a bad idea to have all server tasks in same repo
17:43:22  <planetmaker> yes
17:43:30  <planetmaker> though... not necessarily.
17:43:33  <planetmaker> Make it branches :-)
17:43:44  <Ammler> I thought, it is a bit overkill to have a repo for just 1-2 files
17:44:04  <Ammler> branches wouldn't work
17:44:11  <planetmaker> I understand that thought well, too
17:44:16  <planetmaker> why wouldn't branches work?
17:44:22  <Ammler> as I use the working dir directly
17:44:49  <planetmaker> ok
17:45:57  <andythenorth> hmm
17:46:00  <andythenorth> I am stuck
17:47:28  * planetmaker gives andythenorth a rope, as motorized winch and some lubricant ;-)
17:48:31  <Ammler> planetmaker: there might be a way to read the head rev of a branch without checkout?
17:48:47  <andythenorth> fixed my reading the manual :P
17:49:27  <planetmaker> Ammler: hg branches or hg heads
17:49:48  <Alberth> Ammler: ask the ID of the branch?  (hg id -r default)
17:49:58  <planetmaker> Ammler: yes. hg branches
17:50:20  <planetmaker> 0.3                         1018:8724dc47957e
17:50:22  <planetmaker> default                     1017:2e0927b4b5bf
17:50:25  <Ammler> I see
17:50:47  <Ammler> Alberth: id is like parent, isn't?
17:50:52  * andythenorth forgot what is to be drawn
17:50:59  <andythenorth> silly merge problem distracted me
17:51:19  <Brot6> HEQS "Heavy Equipment" Set - Revision 323:07c8d7591804: merge (andythenorth) @
17:51:19  <Brot6> HEQS "Heavy Equipment" Set - Revision 324:7cbf3f834650: Resolve merge (andythenorth) @
17:51:21  <Ammler> :-D
17:51:29  <planetmaker> Ammler: hg id will only give info about the currently checked out version
17:51:36  <Ammler> like parent
17:52:02  <andythenorth> nice thing about drawing train wagons: only 4 views needed :)
17:52:11  <planetmaker> yes,... dunno the differences now
17:52:15  <planetmaker> id is probably more concise
17:52:24  <Ammler> I guess, I will fix your commit, not revert :-P
17:52:27  <Alberth> planetmaker:  identify the working copy *or* *specified* *revision*
17:52:38  <planetmaker> hm, yes
17:52:45  <planetmaker> works with both, parent and id, though
17:52:46  <Alberth> branches gives a list of what exists
17:52:50  <planetmaker> if the rev is expicitly given
17:53:43  <Ammler> hg id -nr default
17:54:13  <planetmaker> parent gives you also the predecessors and some additional info. Id is easier, if you need just one of the numbers
17:54:22  <planetmaker> like tag, rev-nr, hash
17:55:30  <Ammler> possible to get the full hash with id?
17:57:55  <planetmaker> hg id -i
18:01:28  *** PeterT has quit IRC
18:02:08  *** PeterT has joined #openttdcoop.devzone
18:04:31  <Ammler> that does only output the short
18:04:46  <Ammler> but could be enough :-)
18:06:35  <planetmaker> Ammler: it's not longer...
18:06:41  <planetmaker> afaik
18:06:56  <planetmaker> hg st
18:06:59  <planetmaker> err...
18:07:00  <Ammler> well, I could shorten it, 12 might be enough
18:09:27  <Brot6> HEQS "Heavy Equipment" Set - Revision 325:b6c6f83e2384: Change: progress on graphics for Tram w... (andythenorth) @
18:10:19  <Brot6> newgrf_makefile: update from  to 0.3.0 done (3 errors) -
18:10:45  <Brot6> Example NewGRF Project - Revision 110:de3df40a5162: Added tag 0.3.0 for changeset 74655c4f9382 (planetmaker) @
18:11:52  <planetmaker> hm... not good
18:13:50  <Brot6> firs: update from r1011 to r1017 done -
18:14:19  <Brot6> fish: update from r375 to r384 done (10 errors) -
18:14:24  <Ammler> planetmaker: ^ :-)
18:14:35  <planetmaker> :-) looks better
18:14:39  <Brot6> newgrf_makefile: update from r96 to r110 done -
18:14:46  <Ammler> not a revert, a fix :-)
18:15:02  <planetmaker> that's what I hoped for :-)
18:15:20  <planetmaker> and there'll be a 0.3.1 for newgrf makefile VERY soon
18:15:26  <Brot6> nml: update from r523 to r527 done -
18:16:06  <Brot6> swedishrails: update from r80 to r123 done -
18:16:08  <Brot6> Following repos didn't need a nightlies update: 2cctrainset (r559), 32bpp-extra (r36), airportsplus (r50), bros (r12), comic-houses (r70), nmts (r16), nutracks (r79), ogfxplus (r32), opengfx (r461), openmsx (r78), opensfx (r94), snowlinemod (r12), worldairlinersset (r648)
18:17:00  <Brot6> Example NewGRF Project - Revision 111:a192dffb5ec0: Fix (r109): Run full test before push (planetmaker) @
18:19:48  <Brot6> #openttdcoop - Revision 79:c6de64b5bfbb: [Compiler] Fix (r75): use id with named rev instead pare... (Ammler) @
18:22:59  <Brot6> newgrf_makefile: update from 0.3.0 to 0.3.1 done -
18:23:39  <Brot6> Example NewGRF Project - Revision 112:5a6ec1825422: Added tag 0.3.1 for changeset a192dffb5ec0 (planetmaker) @
18:26:47  <Brot6> HEQS "Heavy Equipment" Set - Revision 326:b28cfe4449ac: Change: more progress on graphics for T... (andythenorth) @
18:30:03  <Ammler> [20:15] <planetmaker> and there'll be a 0.3.1 for newgrf makefile VERY soon <-- suggestion for a target: make sysupdate
18:30:49  <Brot6> Example NewGRF Project - Revision 113:5cb717768ab3: Doc: Changelog for the last revisions (planetmaker) @
18:33:12  <planetmaker> andythenorth: pull firs
18:33:30  <planetmaker> Ammler: what would 'sysupdate' do?
18:33:43  <Ammler> update the makefile framework
18:35:15  <Brot6> FIRS Industry Replacement Set - Revision 1019:4ef8d4a9fb32: Change: Update Makefile to 0.3.1 (planetmaker) @
18:37:17  <planetmaker> ... there's no live stream of the current football match :-O
18:38:12  <Ammler> I fear my upload is too weak, else you stream from my box :-)
18:52:48  <planetmaker> oh well. Radio it is then
18:54:48  <Ammler> planetmaker: you committed your FIRS update to the 0.3 branch
18:56:17  <planetmaker> darn
18:56:21  <planetmaker> I should update both
18:56:31  <planetmaker> so no failure yet :-)
18:57:47  <planetmaker> But the branch which is committed to should be noted in the commit messages...
18:58:48  <Ammler> that is
18:58:56  <Ammler>
18:59:12  <Brot6> FIRS Industry Replacement Set - Revision 1020:8629afc4b8a0: Change: Update Makefile to 0.3.1 (planetmaker) @
18:59:20  *** dan123 has joined #openttdcoop.devzone
19:00:06  <Ammler> planetmaker: how did you merge?
19:00:12  <Ammler> or even not merge
19:00:44  <Ammler> imo, you should have committed it to default and then backport to 0.3
19:01:01  <planetmaker> yes, I should
19:01:16  <planetmaker> But I did it wrong and committed to 0.3
19:01:26  <Ammler> I would wonder, how you do that :-)
19:01:27  <planetmaker> Then I used transplant to copy it also to default
19:01:37  <planetmaker> hg transplant 1019
19:01:41  <planetmaker> in the default branch
19:01:47  <Ammler> that's all?
19:01:50  <planetmaker> yes
19:01:53  <planetmaker> then hg push
19:01:54  <Ammler> he :-)
19:02:13  <planetmaker> you need to activate that extension.
19:02:17  <planetmaker> I activated it globally
19:02:20  <Ammler> oh
19:02:27  <Ammler> how is it called?
19:02:29  <planetmaker> it's shipped with default mercurial, though
19:02:31  <planetmaker> transplant
19:04:06  <Ammler> it would be nice, if openttd does also ship the openttd repos with branches
19:04:12  <Ammler> and not seperate repos
19:05:27  <Ammler> If I would convert openttd self, I would get other IDs, which isn't that nice
19:10:27  <planetmaker> andythenorth: pull fish
19:11:43  <Brot6> FISH - Revision 385:7f7444d26e9e: Change: Update Makefile to 0.3.1 (planetmaker) @
19:14:38  <planetmaker> andythenorth: and heqs
19:15:53  <Brot6> HEQS "Heavy Equipment" Set - Revision 327:c1266f79d838: Change: Update Makefile to 0.3.1 (planetmaker) @
19:26:33  <Brot6> 2cc train set - Revision 560:89b322ea78a2: Fix: Don't ever use files with space in their name. It... (planetmaker) @
19:27:01  <Ammler> planetmaker: those are files from the ugly commit ^
19:27:09  <planetmaker> I know
19:27:17  <planetmaker> Still they broke bundle_src
19:27:26  <planetmaker> I won't do further cleanup, though
19:27:31  <Ammler> you should have deleted those
19:27:36  <planetmaker> His task
19:28:24  <Ammler> strip that changeset would be the fix :-(
19:28:34  <planetmaker> probably
19:30:27  <Brot6> OpenGFX - Revision 462:aa7f4028d2c6: Change: Update Makefile to 0.3.1 (planetmaker) @
19:39:23  <Brot6> Swedish Rails - Revision 124:21ac3cfef479: Change: [Makefile] Update Makefile to 0.3.1 (planetmaker) @
19:41:51  <Brot6> Climate dependant airports - Revision 51:372ec1e23bea: Change: [Makefile] Update to Makefile 0.3.1 (planetmaker) @
19:43:58  <Brot6> Nutracks - Revision 80:3ceaedf37f60: Change: [Makefile] Update Makefile to 0.3.1 (planetmaker) @
19:45:33  <Brot6> OpenGFX+ - Revision 33:30c8faf4b052: Change: [Makefile] Update Makefile to 0.3.1 (planetmaker) @
19:48:41  <andythenorth> planetmaker: pulled all repos
19:49:01  <andythenorth> everything builds
19:50:32  <Brot6> Snowline mod - Revision 13:d328c3de3447: Change: [Makefile] Update Makefile to 0.3.1 (planetmaker) @
19:50:32  <Brot6> Snowline mod - Revision 14:03c3c4bcd5ee: Merge -r12:13 (planetmaker) @
19:51:00  <Ammler> hmm :'-(
19:51:17  <planetmaker> what's up, Ammler ?
19:51:31  <Ammler> I know, you like merges :-P
19:51:33  <planetmaker> yes, I couldn't somehow solve it otherwise
19:51:39  <planetmaker> and no, I don't
19:57:32  <Brot6> OpenSFX - Revision 95:c9c6a6544d5a: Change: [Makefile] Update to Makefile 0.3.1 (planetmaker) @
20:04:37  <Brot6> OpenMSX - Revision 79:ed49a38b3d09: Change: [Makefile] Update Makefile to 0.3.1 (planetmaker) @
20:39:52  <Alberth> good night
20:40:57  <welshdragon> Ammler: does look alright to you? these will be the grf's loaded when i start a new game on my server
20:41:22  <Ammler> configure the game locally and load it on the server
20:41:35  <Ammler> else it might be fine
20:42:19  <Ammler> I don't think, you will get canstatw.grf from bananas
20:42:40  *** Alberth has left #openttdcoop.devzone
20:43:16  <welshdragon> Ammler: i tried configuring it locally
20:43:31  <welshdragon> and that caused problems
20:43:50  <Ammler> that is how we configure our games...
20:44:03  <Ammler> since there is bananas
20:44:13  <welshdragon> Ammler: yeah, i know
20:44:42  <welshdragon> all the data files are on the server anyway
20:45:14  <Ammler> yes, and?
20:45:50  <welshdragon> ... never mind
21:03:13  *** ODM has quit IRC
21:12:20  <welshdragon> Ammler: i stand corrected, adding those lines to the config didn't work
21:12:26  * welshdragon glares at PeterT
21:13:03  <Ammler> paste your output of openttd start
21:14:25  <Ammler> openttd -D -dgrf=1 net=0
21:14:30  <welshdragon> ...bear in mind this is ap+
21:14:52  <Ammler> yes, but debugging is without ap+
21:15:04  <welshdragon>
21:15:12  <welshdragon> Ammler: i'm not wanting to debug
21:15:23  <welshdragon> i just want a game with working grf's
21:15:38  <Ammler> oh, then please go somewhere else for help...
21:15:39  <welshdragon> the config worked fine with generating the new map
21:15:55  <welshdragon> it just didn't load the grf's...
21:15:56  <Ammler> the cfg has no influence on saves
21:16:06  <welshdragon> it's not a save
21:16:11  <welshdragon> it's a new game
21:16:18  <Ammler> then paste the output of the command
21:16:29  <Ammler> it is the same as ap+ would make
21:17:20  <welshdragon> ...
21:18:23  <welshdragon> Please explain why I have to do EVERYTHING with OpenTTD Dedicated when it's evident that a) the data files are not present in OpenTTD Dedicated... oh forget it
21:18:43  <welshdragon> I'm not in the mood
21:19:33  <Ammler> yes, please go...
21:22:27  <andythenorth> planetmaker: FIRS build error
21:22:34  <planetmaker> oh no.
21:22:35  <andythenorth> [Generating] docs/readme.txt
21:22:35  <andythenorth> sed: first RE may not be empty
21:22:35  <andythenorth> make: *** [docs/readme.txt] Error 1
21:22:42  <andythenorth> probably a simple one no?
21:22:45  <planetmaker> Blinking lights in SE rails
21:22:57  <planetmaker> hm, yes, maybe
21:23:00  <planetmaker> yes indeed
21:28:08  <planetmaker> pull, andythenorth
21:28:51  <andythenorth> planetmaker: done thanks :)
21:28:51  <Brot6> FIRS Industry Replacement Set - Revision 1021:62385e7dffee: Fix (r1017): At least tell what you w... (planetmaker) @
21:40:07  <Brot6> FIRS Industry Replacement Set - Revision 1022:78c682a991aa: Feature: increased number of farms & ... (andythenorth) @
21:41:34  <Brot6> FIRS Industry Replacement Set - Feature #1064 (Closed): Consider increasing the number of farms /... (andythenorth) @
21:41:34  <Brot6> FIRS Industry Replacement Set - Feature #1064: Consider increasing the number of farms / farm clu... (andythenorth) @
21:47:17  <andythenorth> good night
21:48:13  <Ammler> gute Nacht
21:54:04  <Brot6> Swedish Rails - Revision 125:d5309b9203c5: Change: Flashing red lights at closed level crossings (planetmaker) @
21:54:33  <planetmaker> g'night andythenorth
21:54:40  <planetmaker> and good night Ammler
22:07:03  <Brot6> repository /home/ottdc/hg-repos/ottdbash registered in Redmine with url /home/ottdc/hg-repos/ottdbash
22:07:03  <Brot6> repository /home/ottdc/hg-repos/ottdbash created
22:24:45  *** Seberoth has quit IRC
22:25:32  *** frosch123 has quit IRC
22:30:38  <Brot6> NewGRF Meta Language - Revision 528:51f0c9f73955: Add: railtype_flag_no_level_crossing (as of Ope... (planetmaker) @
22:32:04  <Rubidium> Ammler: apt-cache search, not apt-get search (yeah, I know... it's confusing).
22:32:30  <Rubidium> but then... in Ubuntu there should be a quite easily findable GUI package manager
22:33:35  <Ammler> Rubidium: thanks :-)
22:33:56  <Ammler> but apt-cache does also find package not installed?
22:34:21  <Ammler> yeah, indeed, he could use a bui
22:34:24  <Ammler> gui*
22:34:35  <Yexo> planetmaker: tab->spaces please ;)
22:35:00  <planetmaker> arg
22:35:09  <Rubidium> Ammler: it does
22:35:10  <planetmaker> why does everything use it differently :S
22:37:18  <planetmaker> honestly, why does NML use it opposite to what OpenTTD uses?
22:39:04  <Brot6> NewGRF Meta Language - Revision 529:bc766443deee: Fix: nasty tabs and whitespaces (planetmaker) @
22:40:03  <Yexo> nearly all python code uses four spaces to indent
22:44:56  <Brot6> Swedish Rails - Revision 126:e415939d12af: Feature: Allow to disable level crossings via parameter 4 (planetmaker) @
22:49:00  <Yexo> how many settings will swedishrails 1.0 have?
22:50:03  <planetmaker> :-) Good question
22:50:26  <planetmaker> This last one is absolutely not needed. And more a toy for the sake of being first ;-)
22:50:38  <planetmaker> Important are only 1,2,3
22:50:44  <planetmaker> the first three
22:51:07  <Yexo> already enough chose for those 3 :p
22:51:13  <Yexo> s/chose/choice/
22:51:37  <planetmaker> which is the compatibility parameter, then the 2nd the old -> modern transition start year and then the fences selection
22:52:03  <planetmaker> I hope at least that fences will become more interesting :-)
22:52:14  <planetmaker> I'm still missing the sprites for it
22:52:39  <planetmaker> but they're a prime candidate for the 2 pseudo-random bits
22:53:31  <planetmaker> besides I don't think that parameters are really bad... if sane defaults are chosen :-)
22:53:45  <Yexo> I completely agree
22:54:24  *** dan123 has quit IRC
22:55:52  <planetmaker> the 4th parameter is actually (again) a old -> modern year. This time for level crossings transition. But it defaults to the depot transition year, if not set

Powered by YARRSTE version: svn-trunk