Back to Home / #openttd / 2018 / 10 / Prev Day | Next Day
#openttd IRC Logs for 2018-10-15

---Logopened Mon Oct 15 00:00:26 2018
00:31-!-triolus [~triolus@97-115-34-1.ptld.qwest.net] has quit [Remote host closed the connection]
00:57-!-Flygon_ [~Flygon@106-68-83-162.dyn.iinet.net.au] has joined #openttd
00:57-!-Flygon_ is "Flygon" on #openttd
01:03-!-snail_UES_ [~snail_UES@cpe-98-14-137-148.nyc.res.rr.com] has quit [Quit: snail_UES_]
01:05-!-Flygon [~Flygon@106-68-83-162.dyn.iinet.net.au] has quit [Ping timeout: 480 seconds]
02:36-!-Wacko1976 [~IceChat9@027-161-128-083.dynamic.caiway.nl] has quit [Ping timeout: 480 seconds]
03:00-!-Supercheese [~Superchee@cpe-98-146-230-183.natnow.res.rr.com] has quit [Quit: Valete omnes]
03:29-!-Wacko1976 [~IceChat9@027-161-128-083.dynamic.caiway.nl] has joined #openttd
03:29-!-Wacko1976 is "The Chat Cool People Use" on #openttd #/r/openttd
03:33-!-Samu [~oftc-webi@pa4-84-91-142-34.netvisao.pt] has joined #openttd
03:33-!-Samu is "OFTC WebIRC Client" on #openttd
04:32-!-matt21347 [~matt21347@77.86.33.102] has joined #openttd
04:32-!-matt21347 is "matt" on #openttd #debian-next #debian-welcome #debian
05:43-!-Wacko1976 [~IceChat9@027-161-128-083.dynamic.caiway.nl] has quit [Ping timeout: 480 seconds]
08:27-!-dvim [~martynas@S0106e46f134086f7.tb.shawcable.net] has joined #openttd
08:27-!-dvim is "martynas" on #qemu #openttd #openjdk
08:54-!-snail_UES_ [~snail_UES@cpe-98-14-137-148.nyc.res.rr.com] has joined #openttd
08:54-!-snail_UES_ is "Jacopo Coletto" on #openttd
08:55-!-matt21347 [~matt21347@77.86.33.102] has quit [Remote host closed the connection]
08:55-!-matt21347 [~matt21347@77.86.33.102] has joined #openttd
08:55-!-matt21347 is "matt" on #debian #debian-welcome #debian-next #openttd
09:04-!-dvim [~martynas@S0106e46f134086f7.tb.shawcable.net] has quit [Read error: Connection reset by peer]
09:07-!-dvim [~martynas@S0106e46f134086f7.tb.shawcable.net] has joined #openttd
09:07-!-dvim is "martynas" on #openttd #openjdk
09:09-!-snail_UES_ [~snail_UES@cpe-98-14-137-148.nyc.res.rr.com] has quit [Quit: snail_UES_]
09:29-!-GroovyNoodle [~NoodleNet@2a07-a880-4601-1048-16c6-2053-e8c6-571b.pool6.ovpn.com] has joined #openttd
09:29-!-GroovyNoodle is "noodlenet.org" on #openttd
09:41-!-Flygon_ [~Flygon@106-68-83-162.dyn.iinet.net.au] has quit [Read error: Connection reset by peer]
09:41<Samu>hi
09:42<dihedral>hey ho
09:42<Xaroth>o7
10:20-!-nielsm [~nielsm@176-23-103-56-cable.dk.customer.tdc.net] has joined #openttd
10:20-!-nielsm is "Niels Martin Hansen" on #openttd #tycoon
10:43-!-Alberth [~alberth@00015f9e.user.oftc.net] has joined #openttd
10:43-!-mode/#openttd [+o Alberth] by ChanServ
10:43-!-Alberth is "purple" on @#openttd
10:44<@Alberth>hola
10:47<@planetmaker>aloha :)
10:48<@planetmaker>https://stackoverflow.com/questions/14989858/get-the-current-git-hash-in-a-python-script <-- anyone can answer my question? :D
10:48<@planetmaker>nml version detection is somewhat broken and I want it more pretty than calling git n times
10:49<Eddi|zuHause>i'm fairly sure there's a git module in python so you don't have to mess with command line
10:50-!-TheMask96 [martijn@pride.vhost.ne2000.nl] has quit [Ping timeout: 480 seconds]
10:50<@planetmaker>I know there is. Not sure I want to include that there, though
10:50<@planetmaker>(it's described in the link I provided there)
10:52<Eddi|zuHause>so then you have two ways to go, neither one of which you like?
10:52<Eddi|zuHause>not sure i can help with that :p
10:53-!-TheMask96 [martijn@envy.vhost.ne2000.nl] has joined #openttd
10:53-!-TheMask96 is "Martijn Zweistra" on #openttd @#altcontrol #openttd.notice
10:53<@planetmaker>:D maybe.
10:59<@Alberth>" One common usage of git rev-parse is to print the SHA1 hashes given a revision specifier. In addition, it has various options to format this output such as --short for printing a shorter unique SHA1 " https://stackoverflow.com/questions/15798862/what-does-git-rev-parse-do#15802301 ?
10:59<@Alberth>ie the second post in your link
11:02<@planetmaker>yeah, maybe that can be utilized to shorten the stuff a lot
11:02<@Alberth>except revision is less than useless to describe the content of the repo
11:02<@planetmaker>it's just a meaningless name.
11:03<@planetmaker>git show HEAD --pretty='%h8 "%at"' or so gives me hash and commit time
11:03<@Alberth>arguably, head^1 or so isn't much better
11:20<@planetmaker>perhaps sth like "git describe HEAD" is a good choice. In connection with the date or so
11:21<@planetmaker>"git describe --tags" I mean.
11:22-!-WWacko1976-work [~IceChat9@ip-80-113-66-42.ip.prioritytelecom.net] has quit [Ping timeout: 480 seconds]
11:24<@planetmaker>0.4.5-1-gc95db24a is actually a decent version for me. It contains the hash for identification. And the distance to the last tag
11:25<@planetmaker>And the last tag itself
11:27<@Alberth>yep, seems useful
11:35<Eddi|zuHause>planetmaker: while you're here, do you have any idea how devzone compiles work? because last time i tried it seemed to have problems "building" eddi-nml, and it couldn't use that to build CETS
11:36<Eddi|zuHause>(everything works locally)
11:37<Eddi|zuHause>(i never tried "building" nml, i just run it)
11:37<Eddi|zuHause>(and i never changed anything build-related)
11:38<@planetmaker>well, yes... did it have problems with eddi-nml itself? Or with using it on a project?
11:39-!-HerzogDeXtEr [~farci@dslb-178-008-119-201.178.008.pools.vodafone-ip.de] has joined #openttd
11:39-!-HerzogDeXtEr is "purple" on #openttd
11:39<Eddi|zuHause>both, i think
11:39<Eddi|zuHause>but i don't know whether one depended on the other or they are unrelated problems
11:40<@Alberth>the former probably defeats the latter :)
11:42<Eddi|zuHause>in CETS: 13:12:49 nmlc: error: no such option: --verbosity (https://jenkins.openttdcoop.org/job/cets/29/console) seems to suggest it runs an outdated version of nmlc
11:43<Eddi|zuHause>and i can't make any sense of https://jenkins.openttdcoop.org/job/eddi-nml/24/console ... it tries to run some pythonw.exe stuff to make an archive or something
11:49<@planetmaker>https://devs.openttd.org/~planetmaker/patches/index.php?source=git_version_detection.diff <-- @Alberth, what do you think?
11:50<@planetmaker>Eddi|zuHause, hm, yes, it tries to build a windoze binary... that's where the pythonw comes from
11:50<@planetmaker>all nicely using a python3.2 or so started in a somewhat ancient wine
11:50<Eddi|zuHause>planetmaker: but there should be no difference to regular nml in that regard
11:51<@Alberth>shouldn't there a abspath in line 51 ?
11:52<@Alberth>line 62, do line counting in python
11:53<@planetmaker>not as far as I know. It's verbatim copy from the existing version detection in line 51...55
11:53<Eddi|zuHause>"# we want to return to where we were. So save the old path" <-- that comment doesn't match any surrounding code
11:53<@Alberth>version.split('-')) == 1 "-" not in version right?
11:54<@planetmaker>right
11:54<@planetmaker>Eddi|zuHause, also correct. Bitrot also in the hg version it seems
11:55-!-sla_ro|master [~sla.ro@84.117.88.126] has joined #openttd
11:55-!-sla_ro|master is "slamaster" on #sla #openttd
11:56-!-dvim [~martynas@S0106e46f134086f7.tb.shawcable.net] has quit [Ping timeout: 480 seconds]
11:56<@Alberth>"-" is pretty fragile, probably, for branch names like "branch-2" or "new-feature"
11:57<Eddi|zuHause>but that would just add more split segments?
11:57-!-Oroburos [~Notthatim@cpc72333-sotn15-2-0-cust299.15-1.cable.virginm.net] has joined #openttd
11:57-!-Oroburos is "realname" on #biz #redditprivacy #privacytools.io #openttd
11:59<Eddi|zuHause>so effectively that means tags containing "-" don't count as "release"?
12:00<@planetmaker>hm, yes
12:04<@Alberth>you don't assign version there?
12:04<@Alberth>except for ''
12:05<@planetmaker>line 78 and 80
12:05<Eddi|zuHause>you only assign version_list before line 68
12:05<Eddi|zuHause>but try to use version there
12:06<@Alberth>test is at 68
12:06<@planetmaker>oh, yes
12:06<Eddi|zuHause>version_list in line 56
12:07<Eddi|zuHause>how does "git describe" work? i can't get useful output on openttd trunk
12:07<Eddi|zuHause>> git describe
12:07<Eddi|zuHause>fatal: Keine Tags können 'fbfa4eb5920b10f57b9fc72730206f4a05c3638d' beschreiben.
12:07<Eddi|zuHause>Versuchen Sie --always oder erstellen Sie einige Tags.
12:07<@Alberth>you didn't check out a branch?
12:08<Eddi|zuHause>says i'm on branch master
12:09<@planetmaker>checking for a release probably can also be done by checking for "-g" in position -10:-9 in the version string. That's more reliable and present when it's not a tag as it's part of the hash
12:10<@planetmaker>Eddi|zuHause, git describe --tags
12:10<Eddi|zuHause>planetmaker: same
12:10<@planetmaker>might not work w/o tags
12:10<Eddi|zuHause>does openttd trunk not contain any tags
12:11<@planetmaker>aye
12:11<@planetmaker>bad :)
12:11<@planetmaker>thus needs different version detection
12:11<Eddi|zuHause>well, probably only in some branches
12:12<@Alberth>it's a converted svn repo, eh :)
12:12<Eddi|zuHause>well "git tag" is definitely not empty :p
12:12<@Alberth>git tag should tell you
12:13<@Alberth>no tag at or above fbfa4eb5920b10f57b9fc72730206f4a05c3638d probably
12:13<@planetmaker>no tag in its history
12:13<@planetmaker>all tags are in branches which are not ancestors
12:13<@planetmaker>hm
12:14<@planetmaker>so it's a good question... do we want such versioning in NML :)
12:15<@planetmaker>would mean to tag a new release for a branch. and to make a new commit on master which then is called "0.6.0-dev" or so (if you just made the 0.5.0 tag on master which then branches off)
12:15<Eddi|zuHause>seems prone to break once you have diverging and re-merging through pull requests and stuff
12:16-!-Supercheese [~Superchee@50.37.127.189] has joined #openttd
12:16-!-Supercheese is "Supercheese" on #openttd
12:39<@planetmaker>that needs research :)
12:44<Eddi|zuHause>planetmaker: think your version patch could benefit from setting "LC_ALL=C"?
12:55-!-Thedarkb-T60 [~Thedarkb-@51-171-49-230-dynamic.agg3.kny.prp-wtd.eircom.net] has joined #openttd
12:55-!-Thedarkb-T60 is "realname" on #openttd #oolite
12:58<@planetmaker>Eddi|zuHause, that as well, yes!
13:00<@planetmaker>thank you you two for your valuable inputs. I'll need to rewrite and re-think some parts... and learn more git :)
13:11-!-Wacko1976 [~IceChat9@027-161-128-083.dynamic.caiway.nl] has joined #openttd
13:11-!-Wacko1976 is "The Chat Cool People Use" on #openttd #/r/openttd
13:12-!-Thedarkb-T60 [~Thedarkb-@51-171-49-230-dynamic.agg3.kny.prp-wtd.eircom.net] has quit [Ping timeout: 480 seconds]
13:13-!-Pikka [~Albert@203.63.189.131] has quit [Ping timeout: 480 seconds]
13:14-!-Progman [~progman@p548D978E.dip0.t-ipconnect.de] has joined #openttd
13:14-!-Progman is "Peter Henschel" on #openttdcoop.dev #openttdcoop #openttd
13:20-!-Wolf01 [~wolf01@0001288e.user.oftc.net] has joined #openttd
13:20-!-Wolf01 is "Wolf01" on #openttd
13:20<Wolf01>o/
13:32-!-andythenorth [~andytheno@cpc87219-aztw31-2-0-cust178.18-1.cable.virginm.net] has joined #openttd
13:32-!-andythenorth is "andythenorth" on #openttd
13:33-!-dvim [~martynas@216-211-115-41.dynamic.tbaytel.net] has joined #openttd
13:33-!-dvim is "martynas" on #openttd #openjdk
13:36-!-Thedarkb-T60 [~Thedarkb-@51-171-49-230-dynamic.agg3.kny.prp-wtd.eircom.net] has joined #openttd
13:36-!-Thedarkb-T60 is "realname" on #openttd #oolite
13:37<@Alberth>o/
13:40<andythenorth>yo
13:40<andythenorth>etc
13:55<Wolf01>o/
14:00-!-frosch123 [~frosch@00013ce7.user.oftc.net] has joined #openttd
14:00-!-frosch123 is "frosch" on #openttdcoop.devzone +#openttd.dev #openttd
14:01<Wolf01>Quak
14:03<frosch123>moo
14:03<frosch123>planetmaker: you could also copy ottd's findversion.sh
14:04<frosch123>it does branches, tags, and stuff
14:05-!-HerzogDeXtEr1 [~farci@dslb-178-008-119-201.178.008.pools.vodafone-ip.de] has joined #openttd
14:05-!-HerzogDeXtEr1 is "purple" on #openttd
14:11<andythenorth>stuff
14:11<andythenorth>things
14:11<Wolf01>Tanks
14:11-!-HerzogDeXtEr [~farci@dslb-178-008-119-201.178.008.pools.vodafone-ip.de] has quit [Ping timeout: 480 seconds]
14:12<@planetmaker>frosch123, hm, that actually might be the simpliest idea :)
14:14<andythenorth>I stopped tanks
14:14<andythenorth>for a bit
14:15<nielsm>speaking of findversion.sh, isn't there a make target to just produce the "static" version data file?
14:15<frosch123>planetmaker: example output: 20181011-pr6939-g2e16bfddM 20181011 2 2e16bfdd936a5d6c73b8ced18c0f8d8d30751ea5
14:15<andythenorth>Wolf01: I am working on this a bit https://www.flickr.com/photos/andythenorth/32176892732/in/photostream/
14:15<andythenorth>it's a lot more done
14:15<nielsm>I don't have any git tools available in my windows build env, but I have a wsl bash open constantly
14:15<nielsm>and basically need to run findversion.sh manually
14:17<frosch123>nielsm: i think that magic is baked into the compile farm
14:17<frosch123>possibly the old compile farm only :p
14:17<@planetmaker>apropos... old CF. Old code: is there anywhere the stuff which is not OpenTTD, but the extras like master server, osie and alike?
14:18<frosch123>it's still in svn
14:18-!-HerzogDeXtEr1 [~farci@dslb-178-008-119-201.178.008.pools.vodafone-ip.de] has quit [Ping timeout: 480 seconds]
14:18<@planetmaker>which is... not exactly accessible :)
14:18<frosch123>and on some trello :)
14:18<frosch123>planetmaker: svn://svn-archive.openttd.org/extra
14:18<frosch123>or similar
14:19<@planetmaker>oho. I didn't know that URL
14:19<andythenorth>there is also the list https://github.com/OpenTTD
14:20<andythenorth>and I linked the trello list https://github.com/OpenTTD/OpenTTD/issues/6916
14:21<andythenorth>Wolf01: more done https://www.flickr.com/photos/andythenorth/31469465448/in/dateposted-public/
14:24<Wolf01>Nice, it's big
14:28<andythenorth>can anyone repro that this errors? http://bananas.openttd.org/en/manager/update/5446
14:28<andythenorth>I'm logged in on the coop account
14:37-!-Thedarkb-T60 [~Thedarkb-@51-171-49-230-dynamic.agg3.kny.prp-wtd.eircom.net] has quit [Read error: No route to host]
14:37-!-Thedarkb-T60 [~Thedarkb-@51-171-49-230-dynamic.agg3.kny.prp-wtd.eircom.net] has joined #openttd
14:37-!-Thedarkb-T60 is "realname" on #openttd #oolite
14:40-!-gelignite [~gelignite@55d4a55b.access.ecotel.net] has joined #openttd
14:40-!-gelignite is "gelignite" on #openttd
14:53-!-glx [kvirc@000128ec.user.oftc.net] has joined #openttd
14:53-!-mode/#openttd [+v glx] by ChanServ
14:53-!-glx is "Loïc GUILLOUX" on @#opendune @#openttd.noai #openttd.notice +#openttd
14:58<@planetmaker>hmpf... :|
14:59<@planetmaker>$ git -C /home/planetmaker/ottd/grfdev/nml update-index --refresh -q
14:59<@planetmaker>nml/version_info.py: needs update
14:59<@planetmaker>(py36) planetmaker@aeolusmaximus-vortex:~$ echo $?
14:59<@planetmaker>1
15:00<@planetmaker>so why is that command there in findversion.sh, when it actually may fail and not do a thing (in OpenTTD it misses the -q flag which lets it continue anyway)
15:00<@planetmaker>but even then... it returns a non-0 exit status
15:14-!-Wolf01 is now known as Guest593
15:14-!-Wolf01 [~wolf01@0001288e.user.oftc.net] has joined #openttd
15:14-!-Wolf01 is "Wolf01" on #openttd
15:20-!-Guest593 [~wolf01@0001288e.user.oftc.net] has quit [Ping timeout: 480 seconds]
15:25-!-Alberth [~alberth@00015f9e.user.oftc.net] has left #openttd []
15:38-!-Stimrol [~Stimrol@89-160-153-213.du.xdsl.is] has quit [Read error: Connection reset by peer]
15:41-!-Stimrol [~Stimrol@89-160-153-213.du.xdsl.is] has joined #openttd
15:41-!-Stimrol is "Stimrol" on #openttd
15:55-!-dvim [~martynas@216-211-115-41.dynamic.tbaytel.net] has quit [Ping timeout: 480 seconds]
16:13-!-gelignite [~gelignite@55d4a55b.access.ecotel.net] has quit [Quit: Good fight, good night!]
16:14-!-sla_ro|master [~sla.ro@84.117.88.126] has quit []
16:15<@planetmaker>https://devs.openttd.org/~planetmaker/patches/index.php?source=nml_git_version.diff should be a version which now does the same thing as OpenTTD's findversion.sh
16:16-!-iSoSyS [~iSoSyS@2001:8a0:e946:8400:25a1:fc1:4137:d943] has joined #openttd
16:16-!-iSoSyS is "Miguel" on #/r/openttd #openttd
16:19<frosch123>get_child_output("git -C {} update-index --refresh".format(path).split(), env=env) <- ["git", "-C", path, "update-index", "--refresh"] is easier imo
16:19<frosch123>it also works with spaces in paths
16:22<frosch123>i think instead of the try-except you can also pass "check=False" to subprocess.
16:22<frosch123>but not sure
16:24<frosch123>hmm, i did not finish the nml docker thing, i guess
16:27<@planetmaker>hm, right, spaces in paths :|
16:27<@planetmaker>I didn't like to write every word quoted :D
16:32<@planetmaker>try...except is ok for python, I think
16:40<@planetmaker>subprocess.run() has the check=... argument. But that's python 3.5+. In my understanding subprocess.check_output is python 3.1+
16:40<@planetmaker>But that lacks the check argument
16:41<frosch123>oh, new stuff, never mnid then :)
16:42<@planetmaker>actually, my use of the subprocess.DEVNULL constant raises the minimum requirement to 3.3 (instead of 3.2 which is is currently, IIRC)
16:43<@planetmaker>I might want to circumvent using that constant, too
16:51<@planetmaker>gotta play with pull requests, thus created one: https://github.com/OpenTTD/nml/pull/1/commits/998d9690a4739f98bcb009cf7d84c6c6fd57fdfb
16:57<frosch123>planetmaker: you did the default mistake :)
16:58<frosch123>never create a pr from your "master"
16:58-!-dvim [~martynas@S0106a84e3f5e1bb3.tb.shawcable.net] has joined #openttd
16:58-!-dvim is "martynas" on #openttd #openjdk
16:58<frosch123>after merge openttd's master will differ from your master, so you have to do some git magic to repoint your master to the real one
16:59<frosch123>with github: do everything in a custom branch, never commit to master
16:59<@planetmaker>ah, bah
16:59<@planetmaker>time to find out how to rectify this default mistake :)
17:00<frosch123>i guess it's easier after merge
17:00<frosch123>otherwise you have a pr to a no longer existing branch, which makes more trouble :p
17:01<@planetmaker>I'd create a new PR for that sake
17:03-!-nielsm [~nielsm@176-23-103-56-cable.dk.customer.tdc.net] has quit [Ping timeout: 480 seconds]
17:04<andythenorth>branches for all :)
17:04<andythenorth>no charge
17:04<frosch123>did your fix your hg checkout? :p
17:06-!-blathijs [~matthijs@tika.stderr.nl] has quit [Ping timeout: 480 seconds]
17:06<@planetmaker>my hg checkout?
17:06<frosch123>nah, i was just mocking andy
17:10<andythenorth>I deleted it and cloned again
17:11<andythenorth>never use hg branches
17:11<andythenorth>never use hg up
17:12<@planetmaker>nothing wrong with either. But don't use *named* hg branches liberally
17:13<andythenorth>just for info (I did check the docs)
17:13<andythenorth>the correct way to checkout a tag is 'hg up [tag name]'?
17:14<@planetmaker>yes
17:14<@planetmaker>but it doesn't mean you end-up with an unmodified version, if you had a modified one
17:14<@planetmaker>add a hg revert --all before or after you do it
17:15<@planetmaker>(updating doesn't undo any changes you made to the previous version - it simply merges them to the new one)
17:15<andythenorth>in my experience, if there are uncommitted local changes, hg up [tag] fails with an unrecoverable merge
17:15<andythenorth>which I did fix the first time by editing things in .hg
17:15<andythenorth>but now I just delete the repo
17:15-!-matt21347 [~matt21347@77.86.33.102] has quit [Quit: Leaving]
17:16-!-Wormnest [~Wormnest@35.136.176.177] has joined #openttd
17:16-!-Wormnest is "Wormnest" on #openttd
17:16<andythenorth>yeah, that's what catches me out
17:16<andythenorth>I expect to move to a place on the tree, not merge
17:17<andythenorth>one day, git for newgrfs :P
17:18<andythenorth>but no editing history, no interactive rebase, and no force push :P
17:18*andythenorth has simple needs ?P
17:21<andythenorth>also bed
17:21-!-andythenorth [~andytheno@cpc87219-aztw31-2-0-cust178.18-1.cable.virginm.net] has left #openttd []
17:21<@planetmaker>never ever edit "things" in .hg...
17:22-!-Progman [~progman@p548D978E.dip0.t-ipconnect.de] has quit [Remote host closed the connection]
17:31-!-blathijs [~matthijs@tika.stderr.nl] has joined #openttd
17:31-!-blathijs is "Matthijs Kooijman" on #openttd
17:39-!-frosch123 [~frosch@00013ce7.user.oftc.net] has quit [Quit: be yourself, except: if you have the opportunity to be a unicorn, then be a unicorn]
18:03-!-Wolf01 [~wolf01@0001288e.user.oftc.net] has quit [Quit: Once again the world is quick to bury me.]
18:13-!-Thedarkb-T60 [~Thedarkb-@51-171-49-230-dynamic.agg3.kny.prp-wtd.eircom.net] has quit [Ping timeout: 480 seconds]
18:14-!-GroovyNoodle [~NoodleNet@2a07-a880-4601-1048-16c6-2053-e8c6-571b.pool6.ovpn.com] has quit [Quit: Leaving]
18:16-!-Lejving [~Lejving@81-233-148-192-no524.tbcn.telia.com] has quit [Ping timeout: 480 seconds]
18:35<Eddi|zuHause><andythenorth> in my experience, if there are uncommitted local changes, hg up [tag] fails with an unrecoverable merge <-- i would have assumed one could simply abort a merge... but why would it start a merge in the first place? merge with what?
18:35<@planetmaker>merge might be an unconvenient term here. hg simply keeps changes in the working dir, no matter what revision you changeout
18:36<Eddi|zuHause>so a revert --all would have done that...
18:36<@planetmaker>yet with active changes, when updating, the algorithm employed is that of a merge. Yet... there is no merge performed in any terms of VCS
18:36<@planetmaker>Exactly!
18:36<@planetmaker>a hg revert --all will always rescue you
18:36<Eddi|zuHause>i just don't understand andy, then...
18:36<@planetmaker>if necessary update after that anew. And done
18:37<Eddi|zuHause>i have successfully employed hg branches an never had any problems...
18:37-!-Thedarkb-T60 [~Thedarkb-@51-171-49-230-dynamic.agg3.kny.prp-wtd.eircom.net] has joined #openttd
18:37-!-Thedarkb-T60 is "realname" on #openttd #oolite
18:37-!-Wacko1976 [~IceChat9@027-161-128-083.dynamic.caiway.nl] has quit [Ping timeout: 480 seconds]
18:38<@planetmaker>I've done A LOT of things in hg repos... and never had to throw away my repo just for the sake of updating accross branches or alike
18:46-!-Wormnest [~Wormnest@35.136.176.177] has quit [Quit: Leaving]
18:52-!-iSoSyS [~iSoSyS@2001:8a0:e946:8400:25a1:fc1:4137:d943] has quit [Remote host closed the connection]
19:11-!-Oroburos [~Notthatim@cpc72333-sotn15-2-0-cust299.15-1.cable.virginm.net] has quit [Quit: Leaving]
19:14-!-peter1138 [~petern@00013681.user.oftc.net] has quit [Remote host closed the connection]
19:14-!-peter1138 [~petern@00013681.user.oftc.net] has joined #openttd
19:14-!-mode/#openttd [+o peter1138] by ChanServ
19:14-!-peter1138 is "Peter Nelson" on #debian #tycoon @#openttd
19:24-!-Flygon [~Flygon@106-68-83-162.dyn.iinet.net.au] has joined #openttd
19:24-!-Flygon is "Flygon" on #openttd
19:45-!-Lejving [~Lejving@81-233-148-192-no524.tbcn.telia.com] has joined #openttd
19:45-!-Lejving is "realname" on #openttd #/r/openttd #factoriocoop #mashinky #openttdcoop #openttdcoop.stable @#openttdcoop.pz
19:51-!-sim-al2 [~sim-al2@c-75-65-196-171.hsd1.tn.comcast.net] has quit [Ping timeout: 480 seconds]
19:54-!-Samu [~oftc-webi@pa4-84-91-142-34.netvisao.pt] has quit [Quit: Page closed]
20:09-!-Pikka [~Albert@203.63.189.131] has joined #openttd
20:09-!-Pikka is "realname" on #openttd
20:31-!-Thedarkb-T60 [~Thedarkb-@51-171-49-230-dynamic.agg3.kny.prp-wtd.eircom.net] has quit [Ping timeout: 480 seconds]
20:58-!-mindlesstux [uid18072@id-18072.charlton.irccloud.com] has joined #openttd
20:58-!-mindlesstux is "Tux" on #openttd #ipv6
20:58-!-Supercheese [~Superchee@50.37.127.189] has quit [Quit: Valete omnes]
21:07-!-over_mind is "over_mind" on #debian
21:07-!-over_mind [b9dc6515@107.161.19.109] has joined #openttd
21:21-!-Supercheese [~Superchee@cpe-98-146-230-183.natnow.res.rr.com] has joined #openttd
21:21-!-Supercheese is "Supercheese" on #openttd
21:22-!-WWacko1976-work [~IceChat9@ip-80-113-66-42.ip.prioritytelecom.net] has joined #openttd
21:22-!-WWacko1976-work is "YO!" on #openttd #/r/openttd
21:29-!-wodencafe [~cboyd@cpe-66-25-7-231.tx.res.rr.com] has quit [Quit: Konversation terminated!]
21:30-!-tokai [~tokai@00012860.user.oftc.net] has joined #openttd
21:30-!-mode/#openttd [+v tokai] by ChanServ
21:30-!-tokai is "Christian Rosentreter" on +#openttd
21:33-!-dvim [~martynas@S0106a84e3f5e1bb3.tb.shawcable.net] has quit [Ping timeout: 480 seconds]
21:35-!-Supercheese [~Superchee@cpe-98-146-230-183.natnow.res.rr.com] has quit [Read error: Connection reset by peer]
21:35-!-Supercheese [~Superchee@cpe-98-146-230-183.natnow.res.rr.com] has joined #openttd
21:35-!-Supercheese is "Supercheese" on #openttd
21:37-!-tokai|noir [~tokai@00012860.user.oftc.net] has quit [Ping timeout: 480 seconds]
21:52-!-over__mind [6dc98564@107.161.19.53] has joined #openttd
21:52-!-over__mind is "over_mind" on #Qubes_OS #publiclab #ovirt #openttd #oftc #debian-next #debian ##politics
21:53-!-over_mind [b9dc6515@107.161.19.109] has quit []
21:58-!-snail_UES_ [~snail_UES@cpe-98-14-137-148.nyc.res.rr.com] has joined #openttd
21:58-!-snail_UES_ is "Jacopo Coletto" on #openttd
22:26-!-dvim [~martynas@216-211-106-42.dynamic.tbaytel.net] has joined #openttd
22:26-!-dvim is "martynas" on #openttd #openjdk
22:30-!-over__mind is now known as over_mind
22:49-!-glx [kvirc@000128ec.user.oftc.net] has quit [Quit: Bye]
23:07-!-haudrauf [~haudrauf2@00021656.user.oftc.net] has quit [Ping timeout: 480 seconds]
23:08-!-haudrauf [~haudrauf2@p200300C35F0F59009568E3BE5F1E5099.dip0.t-ipconnect.de] has joined #openttd
23:08-!-haudrauf is "Haudrauf" on #openttd #frickelplatz @#ffod @#ffnord @#ffki @#ffhl @#ffhh @#fffl #cryptoparty @#ccchh @#ccc.do
23:14-!-KouDy [~koudy@ip4-83-240-28-102.cust.nbox.cz] has quit [Read error: Connection reset by peer]
23:16-!-KouDy [~koudy@ip4-83-240-28-102.cust.nbox.cz] has joined #openttd
23:16-!-KouDy is "KouDy" on #openttd
23:25-!-KouDy [~koudy@ip4-83-240-28-102.cust.nbox.cz] has quit [Remote host closed the connection]
23:27-!-KouDy [~koudy@ip4-83-240-28-102.cust.nbox.cz] has joined #openttd
23:27-!-KouDy is "KouDy" on #openttd
23:54-!-Pikka [~Albert@203.63.189.131] has quit [Ping timeout: 480 seconds]
---Logclosed Tue Oct 16 00:00:27 2018