IRC logs for #openttd on OFTC at 2018-01-25
⏴ go to previous day
00:10:34 <Samu> do i still need tortoise svn? i'm slightly confused yet
00:11:42 <Samu> i can't apply patches anymore. guess i need tortoise svn after all
00:13:19 *** Thedarkb has joined #openttd
00:24:29 *** Gustavo6046 has joined #openttd
00:25:16 *** ToBeFree has joined #openttd
00:27:11 <Mahjong> how curious, I had to close my server so I saved it, then reloaded, and all my Z1s had another two carriages duplicated onto the end of them
00:28:42 <Eddi|zuHause> did you use autoreplace?
00:29:25 <Mahjong> might have been that actually come to think of it yeah
00:30:37 <Mahjong> I guess "wagon removal" needs to be on to keep it the same length
00:30:41 <Mahjong> I didn't see that aoption
00:31:14 <ST2> hooorray, Eddi|zuHause solved another case ;)
00:32:20 <Samu> ok, i still dunno how to make this work
00:33:06 <ST2> we have our own repo's on BTPro, and all are SVN based, for years
00:34:10 <ST2> well, guess we took the "easy" way at the time xD
00:48:01 <Samu> i fail at understanding the purpose of this program
00:49:09 <Samu> how do i delete a revision?
00:49:49 <Samu> i created a 22740 and a 22741, while openttd is still at 22739
00:49:59 <Samu> i just dont get this program
00:58:31 <LordAro> Samu: there are ways to delete revisions
00:58:39 <LordAro> what you've done is make a local commit
00:58:55 <LordAro> you can't make a remote commit, obviously, as you're not a dev
00:59:28 <LordAro> Samu: i'll give you a hint: the first result for googling "hg delete commit"
01:00:02 <LordAro> there's even a tortoisehg answer
01:01:21 <LordAro> (also, just so you get the terminology right, "mercurial" is the name of the VCS ("svn" is a different VCS), "hg" is the command you use to operate on a repo controlled by mercurial, and "tortoisehg" is a gui frontend to "hg")
01:20:40 <Samu> i have a better way to deal with this
01:20:54 <Samu> send to recycle bin, restart from 0
01:26:05 <LordAro> that's decidedly not a better solution
01:27:28 <Samu> yeah google results is use strip or whatever extension command line crap, while I installed a gui program... no thx
01:27:51 <LordAro> like, for more than 30s
01:28:15 <ST2> open a cmd, format C:, yes
01:28:25 <ST2> always works on cleaning stuff ^^
01:28:46 <LordAro> would be ultimately more productive
03:13:07 *** sim-al2 has joined #openttd
03:53:27 *** sim-al2 has joined #openttd
04:02:39 *** Feuersalamander has joined #openttd
05:18:05 *** Mahjong has joined #openttd
05:47:54 *** Supercheese has joined #openttd
07:28:27 *** sim-al2 is now known as Guest2663
07:28:29 *** sim-al2 has joined #openttd
07:46:24 *** Thedarkb has joined #openttd
07:48:31 *** sla_ro|master has joined #openttd
07:53:05 *** Breckett has joined #openttd
08:18:04 *** Biolunar has joined #openttd
09:33:53 *** Supercheese has joined #openttd
09:38:07 <debdog> is there a way to view game settings for the scenario used in OpenTTD's splash screens? in this case the physics settings of the 1.7.x versions
09:38:50 <debdog> or, ideally, a .sav file of that scenario.
09:39:57 <LordAro> debdog: openttd.dat(?) is just a renamed .sav file
09:40:19 <LordAro> rename it, open it, look at it
09:44:21 <debdog> hum where would I find this file on linux?
09:44:55 <debdog> find /usr -iname openttd.dat returned nothing
09:46:49 <LordAro> that is a good question
09:48:07 <debdog> mayhap the fille's name changed over time
09:48:28 <LordAro> nah, openttd hasn't changed significantly in years :p
09:49:10 <LordAro> my bad, misremembered
09:51:26 <debdog> cool, that worked. thanks!
09:55:44 *** Breckett has joined #openttd
10:53:38 *** FLHerne has joined #openttd
11:07:32 *** tokai|noir has joined #openttd
11:07:33 *** ChanServ sets mode: +v tokai|noir
11:13:57 <Cadmus> Hello, I've started a server for some friends, but haven't played in a very long time. Could someone recommend some GRFs for road, rail, and sea that go to the near future? AV8 (or its successor) already has me covered for air.
11:16:31 *** john-aj has joined #openttd
11:19:15 <Alkel_U3> I'd still recommend eGRVTS for road. SQUID for waterways and either Pineapple / Iron horse for rail if you want something "like original but different/better" or NUTS if you want... to go nuts with it :-)
11:24:47 <debdog> haha "Features lickable pixels..."
11:25:06 <debdog> FISH ship set 0.9.2 Description
11:26:24 <debdog> prolly keep some glass cleaner handy
11:44:47 <Cadmus> Thanks folks. I'll take a look at them, I guess with a lot of these sets you have a much earlier start (1899?), so a longer game even if you stop at 2020 or 2030
11:51:04 <Cadmus> I thought SQUID supersed FISH now?
11:51:19 <Samu> i fail at understanding what a repository is for
11:52:41 *** Flygon_ has joined #openttd
11:52:53 <LordAro> Samu: so you get how all the "commits" that are stored on the svn server? with hg/git (and other "distributed" version control systems (DVCS)), this copy of the commits is stored on your computer, as opposed to just a central server
11:53:36 <LordAro> this allows you to make a separate set of commits/changes
11:53:45 <LordAro> which i think was your original goal
11:57:36 <Samu> what i'm trying to do is, create multiple patches in a sequence. First patch is against last trunk revision, currently r27967
11:57:45 <Samu> Second patch is against my own patch
11:57:59 <Samu> but i only able to patch against r27967
11:58:40 <LordAro> but with hg, you can create your own commit "r27968" (hg doesn't use revision numbers, but it's effectively the same thing)
11:58:45 <LordAro> and then apply another commit to that
12:00:08 <Samu> kdiff3 looks so ugly in comparison with tortoise diff
12:01:42 <Samu> what happens when the real central openttd updates to r27968? how am i update my own stuff to the new revision?
12:06:05 <LordAro> that's where it gets a bit tricky
12:06:14 <LordAro> but let's cross that bridge when we get to it :)
12:11:21 <Samu> Commit failed (details follow): Authorization failed
12:11:32 *** FLHerne has joined #openttd
12:12:38 <Samu> commit to: svn://svn.openttd.org/trunk
12:12:48 <Samu> hmm this is not where I want to send my commits, or is it?
12:16:25 <LordAro> not that it'll work either way
12:16:43 <LordAro> but you don't want to send your commits anywhere
12:23:17 <Samu> file:///D:/OpenTTD/trunkrepositorysvn/trunk
12:23:25 <Samu> this is my repository, it's emtpy :(
12:24:55 <Samu> file:///D:/OpenTTD/trunkrepositorysvn/branches
12:25:06 <Samu> file:///D:/OpenTTD/trunkrepositorysvn/tags
12:25:55 <Samu> no idea what I'm doing, really :( t.t
12:28:12 <Samu> "Subversion Repository" is what it says here
12:28:24 <Samu> wasn't is supposed to be mercurial?
12:30:58 <Samu> so confusing, it's "importing" to something that is local
12:39:37 <LordAro> i'm not sure why you're doing any importing
12:59:22 *** Breckett has joined #openttd
13:07:20 <Samu> Commit failed (details follow): Authorization failed
13:07:29 <Samu> i fail... i fail... i fail!
13:09:49 <Samu> what am i doing wrong :|
13:15:19 <LordAro> you can't commit with svn
13:15:43 <Samu> if i can't use svn, then how am I gonna create patches
13:16:35 <Samu> can i create patches with hg?
13:17:04 <LordAro> it's an alternative, not in addition to
13:17:06 <Samu> kdiff3 is an ugly mofo, btw :(
13:17:21 <Samu> that's what's included with hg
13:18:10 <Samu> doesn't seem to let me edit
13:18:22 <Samu> but ok, i will retry with hg
13:18:57 <Samu> nevermind, i can't use the apply patch approach
13:19:44 <Samu> seems i gotta manually move 'aircraft_cmd.cpp' into the folder
13:21:43 <Samu> sorry, i'll be lack later, when i'm more calm
13:43:04 *** Gustavo6046 has joined #openttd
14:37:53 *** Gustavo6046 has joined #openttd
14:37:59 <Samu> question, is it ok to ignore the .hgignore file?
14:38:31 <LordAro> for what you're doing, yes
14:39:09 <LordAro> (.hgignore is how the repo knows which files in the directories to not add to the repo)
14:39:17 <LordAro> (svn does it with file metadata instead)
14:40:49 <Samu> i've added a directory to the ignorelist, but then that made .hgignore to be modified
14:41:08 <Samu> ignoring the ignore sounds ... weird
14:41:29 <LordAro> which directory did you add?
14:41:55 <Samu> a copy of projects, so i can open it on visual studio freely
14:42:05 <Samu> without bothering with changes in the real projects folder
14:42:05 <LordAro> oh, and that's inside your ottd checkout?
14:42:12 <john-aj> well, .hgignore is the file that holds the ignorelist, unless i misunderstand? so it should be modified
14:42:24 *** sim-al2 has joined #openttd
14:42:26 <LordAro> i'd probably want to move it outside the ottd checkout
14:42:53 <LordAro> you shouldn't add IDE/editor related files to ignorelists
14:43:04 <LordAro> they should be added to global/user specific ignore files
14:43:50 <Samu> okay.. wondering how i'm doing that without visual studio complaining
14:45:47 <Samu> global/user specific ignore files... hmmm ahem.. where is that
14:55:06 <Samu> oh wow, visual studio did not complain
14:55:22 <Samu> it only closed all my open tabs, but that's not much of a problem
14:56:02 <Samu> i wonder where it's dumping all those obs files now
14:56:50 <Samu> nevermind, it cannot build :)
14:57:24 <Samu> cannot open source file because... FU
14:57:56 <Samu> so, let me see that username thing
15:00:35 <Samu> rebuilding solution, let's see if it can still do it
15:35:33 *** Breckett has joined #openttd
16:12:56 <Samu> i can't work this out LordAro :(
16:13:28 <LordAro> anything in particular, or just generally?
16:13:38 <LordAro> i can't really help you in the general case
16:13:46 <LordAro> you need to learn what you're doing for yourself
16:14:14 <Samu> apparently i need to split it into 3 commits or so I think
16:16:27 <Samu> in essence, it changes nothing, but it prepares the code for what's to come
16:16:29 <LordAro> i'd question whether such a change should be split further, but do go on
16:18:59 <Samu> only 1 hunk rejected, which is exactly what I want to patch
16:19:03 <LordAro> well, that'd be because it's not a patch file :p
16:19:31 <LordAro> can you create an hg commit with that first patch, on top of a "clean" trunk repo?
16:19:53 <Samu> yes, I mean, i think I did that
16:20:26 <Samu> yup, it commited on its own, but yes, it did ithat
16:20:43 <LordAro> now, you can make the second modification
16:20:59 <LordAro> it'll be easier for you to do this manually, since your patch isn't valid
16:22:14 <LordAro> aye, that looks like commit 1 ( you can see the Rev value on the left)
16:22:24 <Samu> manually, that means type it in visual studio?
16:22:33 <LordAro> (it's offset from the svn revision number in the commit message for svn related shenanigans)
16:29:40 <Samu> ok, visual studio built it
16:32:39 *** sla_ro|master has joined #openttd
16:34:44 <Samu> that 3rd part shouldn' be there, but at least the first part isn't rejected anymore
16:35:16 <Samu> however, i got this in clipboard, not a patch file, doesn't it create patch files on its own?
16:36:45 <Samu> this feels so archaic, not intuitive at all
16:41:17 <Samu> KDiff3 - i fail to understand this program. It points out the differences between two files, but then doesn't let me save... what's wrong
16:42:58 <LordAro> it's different, not necessarily unintuitive
16:43:05 <LordAro> you should be able to commit again
16:43:10 <LordAro> once you've made the 2nd change
16:49:02 <Samu> ok i edited out the 3rd change from within visual studio, only kept the 2nd change, i clicked commit on workbench hg
16:49:21 <Samu> it forced me to enter a commit message
16:50:46 <Samu> i get that diff at the bottom right, but I don't have a patch file of it :( it's just there in this workbench
16:51:59 <LordAro> i don't know tortoisehg, but there will be a way to pull a patch file out of it
16:52:04 <LordAro> have an explore, or a google
16:52:12 <LordAro> and yes, commits usually need commit messages
16:52:52 <LordAro> if you look, your first patch has the commit message "Index: src/...." - which it took from the top of the svn-style patch
16:54:46 <Samu> when i do Diff to Parent
16:55:00 <Samu> i see the differences side by side
16:55:14 <LordAro> right, there'll likely be some sort of export from there
16:55:44 <Samu> with tortoise i could just save the left part of the right part, or both, or even edit the left part or the right part
16:56:02 <Samu> with kdiff3... i can only look, like it's read only mode... can't save
16:59:22 <Samu> ah, i have to click "merge"
17:01:08 <LordAro> merge? within kdiff3?
17:02:51 <Samu> merge allows me to save, but what it saves is the entire aircraft_cmd.cpp file... not a patch, grrr i fail
17:03:54 <Samu> opens a 3rd panel at the bottom, where I decide which of the sides I want
17:04:39 <Samu> and allows me to save... (the file apparently), not a patch~
17:04:47 <LordAro> ok, i've done some searching
17:04:51 <LordAro> turns out kdiff3 is useless :p
17:08:40 <LordAro> for some reason tortoisehg doesn't come with tortoisemerge, whereas the svn & git variants do
17:10:28 <Samu> oh, nice, nice tortoisemerge was listed
17:10:37 <Samu> along with kdiff3 and other stuff
17:12:12 <Samu> yeah, "create patch file"... exactly what I needed
17:13:44 <Samu> eww, this doesn't look right though
17:14:59 <LordAro> doesn't look right, does it?
17:15:10 <LordAro> see if there are some settings
17:16:12 <Samu> Context lines for patches
17:16:56 <Samu> how many lines should go here? 3, 4? moar?
17:18:27 <Samu> better, but still, that header, it's comparing temporary files
17:18:57 <Samu> something's not quite right
17:53:24 <Samu> oh wow... it's dumping too much information though
17:54:34 <Samu> it's using my email address, i do not like this
17:59:42 *** Alberth has joined #openttd
17:59:42 *** ChanServ sets mode: +o Alberth
18:04:17 <Samu> LordAro: why does it dump my email and that crap into the patch file?
18:05:11 <Samu> other than that, it's almost there!
18:05:39 <LordAro> because that's how it works
18:05:44 <LordAro> you can remove it if you like
18:08:02 <Samu> my hgrc file looks like that
18:08:24 <LordAro> Samu: well look at it
18:08:28 <LordAro> what do you think you want to change?
18:08:53 <Samu> i don't want my email to be displayed
18:11:18 <Samu> ah, it's on mercurial.ini
18:13:03 <Samu> nope, my email is still displayed
18:13:10 <Samu> to hell with this program
18:14:22 <LordAro> well it's not going to regenerate it
18:14:24 <Samu> but mercurial.ini no longer has my email
18:14:27 <LordAro> it's embedded into the commit
18:15:10 <Samu> seriously, these kind of programs are spam magnets
18:16:20 <LordAro> get a better email (host) if spam's an issue
18:16:48 <Samu> if i knew i didn't have to provide an email, i wouldn't even type it in
18:17:25 <LordAro> well don't put it anywhere then
18:17:32 <LordAro> modify the patch file before you publish it
18:17:37 <LordAro> it's just a text file
18:17:51 <LordAro> and the commits themselves aren't going to see the light of day
18:25:22 *** Thedarkb has joined #openttd
18:31:28 <Samu> [tortoisehg] ciexclude = projects - Cópia/*
18:31:58 <Samu> i still see it listed... :( i fail, i don't get it, i hate myself...
18:35:37 <Samu> oh ... oh wow.. list options -> ? uknownk
18:35:55 <Samu> i really need to calm down
18:36:57 *** Breckett has joined #openttd
18:37:36 <Samu> does this mean i don't need a ciexclude = projects - Cópia/* for anything?
18:38:47 <Samu> damn thing made me look so stupid
18:41:11 *** Progman has joined #openttd
18:41:22 <Samu> You must identify yourself to Mercurial
18:42:04 <Alberth> of course, how else would you get authorship of a patch
18:43:12 <Alberth> nobody forces you to use a real email address
18:43:30 <Alberth> although a random new email address is easily made
18:43:44 <Alberth> no need to actually read that email either, in general
18:44:04 <Samu> why do these programs force so many pointless steps to work...
18:44:39 <Alberth> 1. enter credentials; 2. work
18:44:44 <Alberth> how is that many steps?
18:45:28 <Alberth> but version control in general does require a bit of setup, which you do one time at the start of a project
18:45:37 <Alberth> takes less than a minute
18:45:51 <Alberth> gives you years of reliable history
18:46:11 <Alberth> and undo and co-operation with others
18:46:26 <Alberth> seems like a fair deal to me
18:51:20 *** john-aj has joined #openttd
18:56:39 <Samu> program is stupid and makes it look like I'm the stupid
18:58:20 <Samu> it doesn't need my username to create a patch
18:58:21 <Alberth> ie the output is what I expect, a diff with commit message and the timestamp and author
18:58:57 <Alberth> huh, it always needed it
18:59:22 <Alberth> I have been using hg for many years, and supplying a name and email address was the first thing I needed to do
19:01:42 <Alberth> the program is designed to be used in a shared repository, so you can make a program together with others
19:01:59 <Alberth> then things need to be labeled properly to avoid confusion
19:02:29 <Alberth> you can also use it all by yourself in a repository that only you can access
19:02:48 <Alberth> in that case supplying a name and email address is a bit useless
19:03:22 <Alberth> but you never know if in the future that code might be useful in a project with others
19:08:03 <Samu> my problem is that I'm using it to create patch sequences, patch chains
19:09:07 <Samu> to be able to patch a second time, i need to submit, which then creates an ugly stupid pointless header to the patch file
19:10:30 <Alberth> so? let it add headers, they are harmless
19:11:16 <Wolf01> Yeah soon or later headers will be added anyway (no clue on the current discussion)
19:12:11 <supermop_work> speaking of which, i still need to draw some door header details
19:15:15 <Alberth> start with the front door?
19:17:23 <supermop_work> that door is actually remaining as is
19:17:52 *** Biolunar has joined #openttd
19:22:15 *** andythenorth has joined #openttd
19:22:36 *** andythenorth has left #openttd
19:23:11 *** Wormnest has joined #openttd
19:23:13 <Wolf01> Also old as the game XD
19:37:00 *** HerzogDeXtEr has joined #openttd
19:42:15 *** Thedarkb has joined #openttd
19:43:04 *** smoke_fumus has joined #openttd
19:49:58 *** iSoSySt has joined #openttd
19:51:11 *** frosch123 has joined #openttd
20:03:54 <Samu> Not a head revision! in red
20:06:15 *** andythenorth has joined #openttd
20:06:23 <Samu> question, this one is a bit more complicated
20:08:14 <Samu> in my poor understanding, all of it makes sense together, but when trying to slice it, i can't think of it working without the rest
20:13:52 <john-aj> Samu: by the way, i'm curious as to what patches are you trying to apply?
20:14:30 <Samu> i'm slicing my work into small patches
20:14:47 <Samu> i have the whole thing in 1 single patch :(
20:15:02 <Alberth> "hangar" sounds like the wrong name for the parameter
20:15:20 <john-aj> ah, it's a patch of your own
20:15:29 <Alberth> lines 10 to 17 look independent?
20:16:29 <Alberth> cancel order is not remove order, is it?
20:17:06 <Samu> make dummy will cancel the current order if it's heading to hangar (manually sent if I remember)
20:17:56 <Samu> that's code is part of "what to do with aircraft going to an airport i just upgraded"
20:18:23 <Samu> upgrading from a small airport to a heliport while the aircraft is heading to hangar
20:19:24 <Alberth> yeah, so it's different, and can be split
20:20:30 <Alberth> you try to do a single small thing each commit
20:21:05 <Alberth> one commit add function, next commit use the new function for its purpose
20:22:51 <LordAro> Alberth: i'd probably argue that adding & using should be one commit
20:23:09 <LordAro> since otherwise you have a commit with dead code
20:24:02 <andythenorth> Wolf01: so what's next?
20:25:44 <andythenorth> ok I refactor some work code :P
20:25:48 <andythenorth> no NRT for me :)
20:26:05 <supermop_work> push the work code to nrt
20:26:27 <Wolf01> Push NRT to the work code
20:27:03 <supermop_work> refactor tanks code
20:30:34 *** Stimrol has joined #openttd
20:33:53 *** Breckett has joined #openttd
20:36:11 *** Gustavo6046 has joined #openttd
20:50:33 *** Stimrol has joined #openttd
20:54:07 <andythenorth> refactor all things
21:02:23 <Eddi|zuHause> refactor 2^77232917-1?
21:06:38 <Eddi|zuHause> "This bug has existed since before curl 6.0. It existed in the first commit we have recorded in the project."
21:17:24 <Alberth> building with daylength, as it took 9 hours :)
21:17:48 <Alberth> but still a masterpiece in organizing it
21:18:44 <Wolf01> IIRC they have supercomputers to organize working shifts on subway too
21:26:13 <peter1138> Health and safety would have fun with that.
21:30:33 *** Stimrol has joined #openttd
21:40:33 *** Stimrol has joined #openttd
21:51:10 *** Supercheese has joined #openttd
22:42:21 <Samu> this is seriously scary, if I mess up one commit, I can't undo it
22:43:07 <john-aj> there are ways to undo it
22:43:10 <Samu> would have to re-do from scratch
22:43:36 *** sim-al2 has joined #openttd
22:44:01 <Samu> they're unelegant from what i've seen
22:45:35 <john-aj> surely more elegant than redoing from scratch ;-)
22:48:54 <Samu> ok, i reached another delicate part... helicopter and service at helipad setting mayhem
22:51:31 <Samu> and moving PendingReplace outside of NeedsAutomaticService
22:52:05 <Samu> they're all related to service at helipad
22:52:06 *** chomwitt has joined #openttd
22:53:11 *** FLHerne has joined #openttd
22:55:27 <Samu> i'm not really sure what needs to be done first
22:56:21 <Samu> the comment in aircraft_cmd.cpp that says - /* Send the helicopter to a hangar if needed for replacement */
22:56:38 <Samu> i trashed that code part
22:57:41 <Samu> now there's automatic service at helipad without the need for a replace, and a non-need to automatic service, but a replace is pending
22:57:59 <Samu> what do i need to do first :(
22:58:28 <LordAro> Samu: you can check compiling and what not before commiting
23:01:11 <Samu> there's also the case there's a need for both automatic service and a pending replace
23:01:50 <Samu> the automatic service at helipad is done first before doing the pending replace check
23:02:47 <Samu> i think i'm gonna deal with service at helipad first, pending replace can wait
23:05:05 <Samu> there's also the case of heliport (no hangar) vs any other airport (hangar)
23:06:45 <Samu> everything needs to be connected with need automatic servicing and service at helipad to make sense
23:07:07 <Samu> hmm, ok, i got a vague idea of the order this has to be done
23:18:49 *** sim-al2 is now known as Guest2728
23:18:49 *** sim-al2 has joined #openttd
23:36:10 *** Thedarkb has joined #openttd
continue to next day ⏵
