--- Log opened Thu Nov 30 00:00:38 2017
20171130 00:01:34-!- Bonobo [~Bonobo@203.63.76.34] has joined #wesnoth-dev
20171130 00:15:27-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection]
20171130 00:15:40-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev
20171130 00:35:29-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Remote host closed the connection]
20171130 00:37:38-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection]
20171130 00:45:13< irker525> wesnoth: Charles Dang wesnoth:master e5cea3516956 / src/game_events/ (handlers.cpp handlers.hpp manager_impl.cpp): Game Events: ensure event names are properly standardized in the config https://github.com/wesnoth/wesnoth/commit/e5cea3516956f1efc66ead156332f4004f3a0f67
20171130 00:46:20-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!]
20171130 00:56:59< vultraz> AI0867: could you please rebase your pr (and squash those two formatting commits down)
20171130 00:57:05< vultraz> seems to be causing issues
20171130 00:57:08< vultraz> somehow
20171130 01:00:15< irker525> wesnoth: Wedge009 wesnoth:master f61138498cc3 / projectfiles/VC12/ (wesnoth.vcxproj wesnoth.vcxproj.filters): Remove header from VC project (deleted in 056d7ac8). https://github.com/wesnoth/wesnoth/commit/f61138498cc3d52793f3c8f383f806d9e3ac767b
20171130 01:02:03< vultraz> wedge009: ah, thanks
20171130 01:02:20< wedge009> Not a big deal.
20171130 01:11:37-!- sigurdfd [sigurdfd@dynamic-acs-72-23-110-196.zoominternet.net] has joined #wesnoth-dev
20171130 01:17:41-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20171130 01:22:07-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Ping timeout: 248 seconds]
20171130 01:45:07-!- celticminstrel [~celmin@unaffiliated/celticminstrel] has joined #wesnoth-dev
20171130 02:17:04-!- travis-ci [~travis-ci@ec2-54-227-7-246.compute-1.amazonaws.com] has joined #wesnoth-dev
20171130 02:17:05< travis-ci> wesnoth/wesnoth#15850 (master - fb5fd3f : Charles Dang): The build failed.
20171130 02:17:06< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/309235234
20171130 02:17:07-!- travis-ci [~travis-ci@ec2-54-227-7-246.compute-1.amazonaws.com] has left #wesnoth-dev []
20171130 02:29:06 * celticminstrel wonders what ISTM stands for.
20171130 02:29:20< celticminstrel> Usage seems to be similar to ISTR, but I can't think what the M would be in that case...
20171130 02:53:56-!- kallaballa [~amir@194-166-158-138.hdsl.highway.telekom.at] has joined #wesnoth-dev
20171130 02:54:54< TadCarlucci> AI0867, I don't think your PR is the cause of the issues but there is something strange going on with it. I think the cause is PR2208 with a merge master-to-branch followed by a merge branch-to-master
20171130 03:02:16-!- kallaballa [~amir@194-166-158-138.hdsl.highway.telekom.at] has quit [Ping timeout: 276 seconds]
20171130 03:24:19 * celticminstrel pokes TadCarlucci for the answer.
20171130 03:44:00-!- Appveyor [~Appveyor@67.225.139.254] has joined #wesnoth-dev
20171130 03:44:00< Appveyor> The Battle for Wesnoth (Visual Studio 2015) - Release pentarctagon 0ab3a1b: . Failed
20171130 03:44:00< Appveyor> Details: https://ci.appveyor.com/project/wesnoth/wesnoth-7lnpw/build/Wesnoth-VS2015-master-780
20171130 03:44:04-!- Appveyor [~Appveyor@67.225.139.254] has left #wesnoth-dev []
20171130 03:47:32-!- travis-ci [~travis-ci@ec2-54-227-7-246.compute-1.amazonaws.com] has joined #wesnoth-dev
20171130 03:47:33< travis-ci> wesnoth/wesnoth#15852 (master - e5cea35 : Charles Dang): The build passed.
20171130 03:47:33< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/309267587
20171130 03:47:33-!- travis-ci [~travis-ci@ec2-54-227-7-246.compute-1.amazonaws.com] has left #wesnoth-dev []
20171130 03:48:43< sigurdfd> there's no way to use lua to launch the create unit (Debug!) menu, correct?
20171130 03:52:15-!- Appveyor [~Appveyor@67.225.139.254] has joined #wesnoth-dev
20171130 03:52:15< Appveyor> The Battle for Wesnoth (Visual Studio 2015) - Debug pentarctagon 0ab3a1b: . Failed
20171130 03:52:15< Appveyor> Details: https://ci.appveyor.com/project/wesnoth/wesnoth-7lnpw/build/Wesnoth-VS2015-master-780
20171130 03:52:19-!- Appveyor [~Appveyor@67.225.139.254] has left #wesnoth-dev []
20171130 03:57:18< TadCarlucci> celticminstrel, Hmm?
20171130 03:57:32< celticminstrel> What does ISTM stand for?
20171130 03:57:45< celticminstrel> Also sigurdfd, that's correct.
20171130 03:57:59< sigurdfd> thought so, thanks
20171130 03:58:28< TadCarlucci> ISTM --> It Seems To Me
20171130 04:01:27-!- Appveyor [~Appveyor@74.205.54.20] has joined #wesnoth-dev
20171130 04:01:27< Appveyor> The Battle for Wesnoth (Visual Studio 2013) - Release pentarctagon 0ab3a1b: . Failed
20171130 04:01:27< Appveyor> Details: https://ci.appveyor.com/project/wesnoth/wesnoth/build/Wesnoth-VS2013-master-786
20171130 04:01:31-!- Appveyor [~Appveyor@74.205.54.20] has left #wesnoth-dev []
20171130 04:09:34-!- Appveyor [~Appveyor@74.205.54.20] has joined #wesnoth-dev
20171130 04:09:34< Appveyor> The Battle for Wesnoth (Visual Studio 2013) - Debug pentarctagon 0ab3a1b: . Failed
20171130 04:09:34< Appveyor> Details: https://ci.appveyor.com/project/wesnoth/wesnoth/build/Wesnoth-VS2013-master-786
20171130 04:09:38-!- Appveyor [~Appveyor@74.205.54.20] has left #wesnoth-dev []
20171130 04:20:29-!- Appveyor [~Appveyor@74.205.54.20] has joined #wesnoth-dev
20171130 04:20:29< Appveyor> The Battle for Wesnoth (Visual Studio 2017) - Release pentarctagon 0ab3a1b: . Failed
20171130 04:20:29< Appveyor> Details: https://ci.appveyor.com/project/wesnoth/wesnoth-605wt/build/Wesnoth-VS2017-master-480
20171130 04:20:33-!- Appveyor [~Appveyor@74.205.54.20] has left #wesnoth-dev []
20171130 04:29:26-!- Appveyor [~Appveyor@74.205.54.20] has joined #wesnoth-dev
20171130 04:29:26< Appveyor> The Battle for Wesnoth (Visual Studio 2017) - Debug pentarctagon 0ab3a1b: . Failed
20171130 04:29:26< Appveyor> Details: https://ci.appveyor.com/project/wesnoth/wesnoth-605wt/build/Wesnoth-VS2017-master-480
20171130 04:29:31-!- Appveyor [~Appveyor@74.205.54.20] has left #wesnoth-dev []
20171130 04:29:39-!- irker525 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout]
20171130 05:09:30-!- celticminstrel [~celmin@unaffiliated/celticminstrel] has quit [Quit: KABOOM! It seems that I have exploded. Please wait while I reinstall the universe.]
20171130 05:12:33-!- sigurdfd [sigurdfd@dynamic-acs-72-23-110-196.zoominternet.net] has quit []
20171130 05:20:31-!- Bonobo [~Bonobo@203.63.76.34] has quit [Ping timeout: 248 seconds]
20171130 05:20:55-!- Bonobo [~Bonobo@203.63.76.34] has joined #wesnoth-dev
20171130 05:24:16-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20171130 05:28:31-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Ping timeout: 248 seconds]
20171130 06:06:53-!- TadCarlucci [~lundberg@74.193.219.119] has quit [Ping timeout: 276 seconds]
20171130 06:54:30-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev
20171130 07:46:21-!- JyrkiVesterinen [~JyrkiVest@195-192-251-124.s1networks.fi] has joined #wesnoth-dev
20171130 08:06:44-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20171130 08:11:40-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Ping timeout: 276 seconds]
20171130 08:33:46-!- irker481 [~irker@uruz.ai0867.net] has joined #wesnoth-dev
20171130 08:33:46< irker481> wesnoth: Alexander van Gessel wesnoth:test-master cd61443f1cf3 / utils/travis/mp_test_executor.sh: Ensure that mp_test_executor exits https://github.com/wesnoth/wesnoth/commit/cd61443f1cf3c9c1fe08e76bde5601ce0d24e687
20171130 08:33:48< irker481> wesnoth: Alexander van Gessel wesnoth:test-master b8186dd25c1e / utils/travis/mp_test_executor.sh: MP test: treat failed init of SDL_video as a 'successful' test https://github.com/wesnoth/wesnoth/commit/b8186dd25c1e2e6617f6642ffe9c17a4a12de336
20171130 08:33:50< irker481> wesnoth: Alexander van Gessel wesnoth:test-master ec90985849a0 / utils/travis/mp_test_executor.sh: Add missing break https://github.com/wesnoth/wesnoth/commit/ec90985849a0097c1d3f5b3ea0b6d929a0376f7d
20171130 08:33:52< irker481> wesnoth: Alexander van Gessel wesnoth:test-master 51fc433f7509 / utils/travis/mp_test_executor.sh: Change *_RUNNING vars to string comparisons https://github.com/wesnoth/wesnoth/commit/51fc433f750981523e4dcb8006ea59136165eb43
20171130 08:33:54< irker481> wesnoth: mattsc wesnoth:test-master 3523e13c8e9d / data/ai/dev/idle_ai.cfg: Idle AI: remove from data/ai/dev after all https://github.com/wesnoth/wesnoth/commit/3523e13c8e9dd5543d9af3c38d4cb0508c342980
20171130 08:33:56< irker481> wesnoth: Paŭlo Ebermann wesnoth:test-master ed3633350131 / data/tools/wesnoth/wmltools3.py: Fix the output by --progress. https://github.com/wesnoth/wesnoth/commit/ed363335013162df5fd8a24b677ff2d7803ed9c6
20171130 08:33:58< irker481> wesnoth: Charles Dang wesnoth:test-master 6151fea80487 / src/saved_game.cpp: Saved Game: formatting cleanup https://github.com/wesnoth/wesnoth/commit/6151fea80487789d56a62452b79b8e23e2583347
20171130 08:34:01< irker481> wesnoth: Charles Dang wesnoth:test-master 5597e1120b4c / src/saved_game.cpp: Saved Game: replaced some uses of boost::copy with simpler std::transform equiva https://github.com/wesnoth/wesnoth/commit/5597e1120b4c1faa8efae7f967b6f61b9e74447b
20171130 08:34:04< irker481> wesnoth: Charles Dang wesnoth:test-master d9c7a2d80298 / src/ (8 files in 6 dirs): Use config::clear over assignment to default-constructed object https://github.com/wesnoth/wesnoth/commit/d9c7a2d80298c79d66718d455f744b2f13174aac
20171130 08:34:07< irker481> wesnoth: Charles Dang wesnoth:test-master d65df4ca1ce7 / src/ (2 files in 2 dirs): Minor tweaks to user map/scenario default descriptions https://github.com/wesnoth/wesnoth/commit/d65df4ca1ce765964acfd0654980710bd549cf56
20171130 08:34:10< irker481> wesnoth: Charles Dang wesnoth:test-master c20a6855fee4 / src/ (filesystem.hpp filesystem_boost.cpp): Filesystem: added optional remove_extension parameter to base_name https://github.com/wesnoth/wesnoth/commit/c20a6855fee4bd244f587e0f5acc1e1bfe0f9b48
20171130 08:34:13< irker481> wesnoth: Charles Dang wesnoth:test-master 03f85d177a79 / src/editor/map/map_context.cpp: Editor: don't include file extension in default scenario id/name (fixes #1840) https://github.com/wesnoth/wesnoth/commit/03f85d177a7945f9ab12beaabaf4d6b7eb9e586f
20171130 08:34:14< JyrkiVesterinen> Someone slience irker please.
20171130 08:34:16< irker481> wesnoth: galegosimpatico wesnoth:test-master 8f836d193727 / .gitignore CMakeLists.txt INSTALL.md SConstruct projectfiles/VC12/README.md: On Boost: update build scripts and documentation. https://github.com/wesnoth/wesnoth/commit/8f836d1937273daf6f5268274675fe82f93acc04
20171130 08:34:18< irker481> wesnoth: Charles Dang wesnoth:test-master 0f38ce6d0949 / src/game_initialization/playcampaign.cpp: Removed extraneous newline from Defeat message https://github.com/wesnoth/wesnoth/commit/0f38ce6d09497852ac899c7ad4a488566b90b743
20171130 08:34:21< irker481> wesnoth: pentarctagon wesnoth:test-master ba3e4636619c / CMakeLists.txt SConstruct src/SConscript: Removed Optimized build, improved gcc LTO support, add clang LTO support. https://github.com/wesnoth/wesnoth/commit/ba3e4636619c98131a74ee9c01b72d57b2e036cb
20171130 08:34:23< irker481> wesnoth: pentarctagon wesnoth:test-master 85591ce0257d / CMakeLists.txt SConstruct: Fixup as requested. https://github.com/wesnoth/wesnoth/commit/85591ce0257d5e4670f0381dc3c972623438d48a
20171130 08:34:25< irker481> wesnoth: newfrenchy83 wesnoth:test-master dcfd61e84fd7 / src/units/unit.cpp: fix hitpoints being restored by heal_full after modifications expire (#2029) https://github.com/wesnoth/wesnoth/commit/dcfd61e84fd789583e497786a123417149867808
20171130 08:34:27< irker481> wesnoth: Celtic Minstrel wesnoth:test-master a802b685e438 / data/core/about.cfg: Add recent new contributors to credits https://github.com/wesnoth/wesnoth/commit/a802b685e4388c8dab722accf7ebd57a9f3f4e58
20171130 08:34:29< irker481> wesnoth: doofus-01 wesnoth:test-master 2a1be25643d8 / data/core/ (76 files in 2 dirs): new terrain variation - Elf castle ruins (#2064) https://github.com/wesnoth/wesnoth/commit/2a1be25643d8214c193b8326129ec55b514e1730
20171130 08:34:31< irker481> wesnoth: Ignacio R. Morelle wesnoth:test-master 66b55de48f92 / changelog src/campaign_server/campaign_server.cpp: campaignd: Use base64-encoded hashes for add-on passphrases again https://github.com/wesnoth/wesnoth/commit/66b55de48f9272647ff4eeca09c1b1e82039351d
20171130 08:34:34< irker481> wesnoth: Charles Dang wesnoth:test-master 75f046a09e11 / src/ (19 files in 8 dirs): Removed trailing tabs and whitespaces from C++ source https://github.com/wesnoth/wesnoth/commit/75f046a09e11ada7c1764882d571b125203522ae
20171130 08:34:37< irker481> wesnoth: Charles Dang wesnoth:test-master e59dec9ffaec / src/spirit_po/ (6 files): Update Spirit Po sources from source repo https://github.com/wesnoth/wesnoth/commit/e59dec9ffaeccb383ffb1bb17ba3c72e21ae7f93
20171130 08:34:40< irker481> wesnoth: Charles Dang wesnoth:test-master e03b4b933dc5 / src/ (gettext_boost.cpp spirit_po.hpp spirit_po/spirit_po.hpp): Moved main Spirit Po header into the spirit_po subdir https://github.com/wesnoth/wesnoth/commit/e03b4b933dc56351a9445377be86b6a534955897
20171130 08:34:43< irker481> wesnoth: Charles Dang wesnoth:test-master 5b2160f3cbe7 / changelog: Updated changelog for 6f952a0daec4 https://github.com/wesnoth/wesnoth/commit/5b2160f3cbe7da1553848b7aa1e32a79f4ee533b
20171130 08:34:46< irker481> wesnoth: Charles Dang wesnoth:test-master 4580f499516d / data/campaigns/Descent_Into_Darkness/maps/ (08_A_Small_Favor2.map 09_A_Small_Favor3.map): DiD S8-S9: use correct directional variants for doors https://github.com/wesnoth/wesnoth/commit/4580f499516d67c61fa4518e0d2dabe18bf829e7
20171130 08:34:49< irker481> wesnoth: Charles Dang wesnoth:test-master 57cab64d4ea5 / data/campaigns/Eastern_Invasion/maps/Throne_Room.map: EI S18: used Clean stone walls for Throne Room map https://github.com/wesnoth/wesnoth/commit/57cab64d4ea5a49c27c0f27e685ac2c2001d6492
20171130 08:34:52< irker481> wesnoth: doofus-01 wesnoth:test-master a84e2fdc88e2 / data/core/ (46 files in 3 dirs): some night-time village images (#2084) https://github.com/wesnoth/wesnoth/commit/a84e2fdc88e2ebc375e4f08a0c7ca6632c6f2754
20171130 08:34:54< irker481> wesnoth: Charles Dang wesnoth:test-master a58491d21156 / data/campaigns/Eastern_Invasion/maps/Throne_Room.map: EI S18: spiff up the Throne Room map https://github.com/wesnoth/wesnoth/commit/a58491d21156952077684769a336bce69e16fe6d
20171130 08:34:57< irker481> wesnoth: pentarctagon wesnoth:test-master d18893ff1601 / SConstruct src/SConscript: Remove support for old tools and builds https://github.com/wesnoth/wesnoth/commit/d18893ff1601ac95b3d4f7dbb8753e7e829588ca
20171130 08:34:59< irker481> wesnoth: pentarctagon wesnoth:test-master 2d7fb14c0ea8 / CMakeLists.txt SConstruct src/SConscript: Re-added things based on replies, and added glibcxx_debug ability to cmake. https://github.com/wesnoth/wesnoth/commit/2d7fb14c0ea8b17120dd65b28f8b1957d9a9ddb9
20171130 08:35:01< irker481> wesnoth: pentarctagon wesnoth:test-master 504d124fcfd3 / SConstruct: Re-add profile build description. https://github.com/wesnoth/wesnoth/commit/504d124fcfd3efe34d0ea93251bd6f44c6d090d6
20171130 08:35:02-!- mode/#wesnoth-dev [+o Soliton] by ChanServ
20171130 08:35:02< matthiaskrgr> o.o
20171130 08:35:03< irker481> wesnoth: pentarctagon wesnoth:test-master 286e0569c40e / CMakeLists.txt SConstruct: Address feedback. https://github.com/wesnoth/wesnoth/commit/286e0569c40e7016411c84883e7011b87099d224
20171130 08:35:07-!- mode/#wesnoth-dev [+q irker481!*@*] by Soliton
20171130 08:35:15< JyrkiVesterinen> Thanks. :)
20171130 08:35:21< matthiaskrgr> force push incomming?
20171130 08:35:35< JyrkiVesterinen> Maybe.
20171130 08:35:37< matthiaskrgr> :s
20171130 08:35:48< vultraz> bad merge 10 days ago messed some stuff up
20171130 08:35:54< matthiaskrgr> uh
20171130 08:36:12< JyrkiVesterinen> Why, oh why, can a Git repository even get into a state this bad?
20171130 08:36:16< JyrkiVesterinen> Git is garbage.
20171130 08:36:40< vultraz> we should have caught it earlier
20171130 08:38:30< matthiaskrgr> maybe you can revert the merge commit
20171130 08:38:44< JyrkiVesterinen> That wouldn't help at all.
20171130 08:38:47< matthiaskrgr> oh
20171130 08:39:07< JyrkiVesterinen> Fully removing the merge commit from history might, but that would be history rewriting as well.
20171130 08:40:01< matthiaskrgr> so is the issue "just reverting change" or "entirey purge commits from history" ? 
20171130 08:40:45< vultraz> latter
20171130 08:40:59< vultraz> the bad merge introduced some duplicate commits
20171130 08:41:10< matthiaskrgr> ok
20171130 08:41:35< JyrkiVesterinen> The presence of duplicate commits, in itself, shouldn't make rebasing impossible, though.
20171130 08:43:02< vn971> What state are you talking about, what do you think is wrong with git?
20171130 08:43:21< JyrkiVesterinen> Pull requests can't be rebased into master.
20171130 08:43:40< vn971> JyrkiVesterinen: that's normal. Why wouldn't it be?
20171130 08:44:06< vn971> obv not every commit can be rebased on any other state.
20171130 08:44:06< JyrkiVesterinen> What do you mean? We have been rebasing PRs for over a year.
20171130 08:44:29< JyrkiVesterinen> The situation is that we can't rebase *any* PRs.
20171130 08:44:30< vn971> JyrkiVesterinen: do a manual rebase then, not the "click github button" thing.
20171130 08:45:07< vultraz> vn971: just please... be quiet. We're handling this.
20171130 08:45:08< vn971> JyrkiVesterinen: if github can't do that, then it's github issue. If git cannot do that, then I'd like to see that myself..
20171130 08:45:34< JyrkiVesterinen> It would be significant additional effort (and have much higher risk of screwing something up) to have to manually rebase all pull requests for all eternity.
20171130 08:46:07< vn971> JyrkiVesterinen: yes. I just want to point out that it's github issue then, not git itself.
20171130 08:47:13< JyrkiVesterinen> Nah, it *is* a Git issue. Something in the repository makes GitHub believe that automatic rebasing isn't safe.
20171130 08:49:59< vn971> JyrkiVesterinen: If you would otherwise go the "force push" path, can you link me the PR that cannot be automatically merged?
20171130 08:50:17< JyrkiVesterinen> [10:44:27] <JyrkiVesterinen> The situation is that we can't rebase *any* PRs.
20171130 08:51:44<@Soliton> i'd ask in #git how we might have gotten in this state and how best to resolve it.
20171130 08:53:55<@Soliton> any idea when irker should be finished?
20171130 08:55:20-!- irker481 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout]
20171130 08:55:39-!- mode/#wesnoth-dev [-q irker481!*@*] by Soliton
20171130 08:55:53-!- mode/#wesnoth-dev [-o Soliton] by ChanServ
20171130 08:56:21< vultraz> should keep him quieted for now
20171130 08:59:46< vn971> If anything, I tried repro, and it works just fine for me: https://gist.github.com/vgaming/eb2b80212c55eb3fb9599c40c22cf7c0   I added the remote (AI0867), checked out his latest PR, did a rebase on top of origin/master. (And invoked `git log` to check that it's indeed rebased.)
20171130 09:00:15< vn971> (This is the PR I followed: https://github.com/wesnoth/wesnoth/pull/2248 )
20171130 09:04:43-!- vladimirslavik [~vslavik@95.82.135.184] has joined #wesnoth-dev
20171130 09:04:52< JyrkiVesterinen> Strange that it seems to work flawlessly with command line. This is what we see in GitHub: https://vgy.me/2K4Lzj
20171130 09:05:05< JyrkiVesterinen> (It's the very same pull request.)
20171130 09:06:05< AI0867> vultraz: it seems merge is smarter than rebase: git can figure out what should happen for a merge, even if it cannot replay the commits on top of master
20171130 09:06:16< vn971> Indeed. I'd report that to github, personally.
20171130 09:06:17< AI0867> and that means you should not be rebase-merging
20171130 09:06:59< JyrkiVesterinen> It's more that merge is more flexible by its nature. Merging and rebasing are completely different operations.
20171130 09:07:35< vn971> AI0867: yes. `git rebase` _loses_ history, and therefore is considered dangerous (even by git itself, not to mention github). So it's normal when auto-rebase fails while auto-merge works good.
20171130 09:08:31< AI0867> vultraz: what is this bad merge you speak of?
20171130 09:08:58< vn971> The best practices regarding rebase, I think, is the following:
20171130 09:08:59< vn971> 1. if you want to rebase and you can without conflicts -- do it.
20171130 09:08:59< vn971> 2. if you see conflicts, do a merge instead.    (This is because a merge is a serious enough issue by itself to be kept in history. It often happens to be the case, at least.)
20171130 09:09:59< AI0867> I agree
20171130 09:10:23< JyrkiVesterinen> That's what I do, for the record. When I need to fix conflicts or otherwise edit the commits before merging, in the end I perform a merge, not a rebase.
20171130 09:10:28< AI0867> which is I'm very concerned about potential history rewriting just to allow some rebases to happen
20171130 09:20:32< vultraz> Oh for god's sake
20171130 09:20:38< vultraz> this is a ridiculous argument
20171130 09:21:22< vultraz> And for the record, no, I personally do *not* do a merge in case of conflicts since the whole point is to NOT have conflicts 
20171130 09:21:24< vultraz> resolved or not
20171130 09:21:47< AI0867> ???
20171130 09:22:06< AI0867> if git can merge fine, but can't rebase, then you should merge
20171130 09:22:13< vultraz> why!
20171130 09:22:16< JyrkiVesterinen> So... nothing can be merged unless the PR author fixes the conflicts himself?
20171130 09:22:49< AI0867> because git can fix your problems without manual interference?
20171130 09:22:55< vultraz> better to rebase to fix conflicts and THEN push instead of creating useless merge commits
20171130 09:23:07< AI0867> no
20171130 09:23:17< AI0867> just no
20171130 09:23:25< vultraz> merge commits are ugly and as we're seeing here, can fuck everything up.
20171130 09:23:30< vn971> Also, people sometimes do _bad_ merges. And git auto-merge is prone to errors, too. Having history can save a lot of time in these cases.
20171130 09:23:39< AI0867> vultraz: POINT ME TO THE PROBLEM
20171130 09:23:56< AI0867> you keep complaining about a broken merge, but I haven't seen it
20171130 09:24:36< vultraz> https://github.com/wesnoth/wesnoth/commit/321c350d7618795df774bc48a2f0a662949e56ce
20171130 09:24:47< vultraz> if you look at history, you'll see this merge duplicated several previous commits
20171130 09:25:01< vultraz> ```870f896a53c7b368664d807a9c19e861cada424c
20171130 09:25:01< vultraz> 0e57d0840a1fc8a65427a5fdc83ee420c51e75ad
20171130 09:25:01< vultraz> 7d910ab07569a77559749fe2744be95ed13333ad
20171130 09:25:01< vultraz> 17c0fd97a818d6847c2a9dea31181009b4a564f9
20171130 09:25:01< vultraz> 5535b363955a0af133b05c72407e0f3743425a2a
20171130 09:25:02< vultraz> c8b37856c59149f7d0c58cf6fe4779971e7a5177
20171130 09:25:02< vultraz> f1b4f79afc7dc7debe51ab610b7571137654e052```
20171130 09:25:19< JyrkiVesterinen> For the record, it was a rebase followed by a merge.
20171130 09:25:49< JyrkiVesterinen> I rebased static-libs to squash Pentarctagon's commits together, then merged the branch to master.
20171130 09:26:03< vn971> "merge" cannot duplicate commits, that's for sure. It creates just one additional commit -- the merge itself -- if it's successful.
20171130 09:26:10< vultraz> you should have merged and then rebased 
20171130 09:26:31< AI0867> 10:24 < vultraz> if you look at history, you'll see this merge duplicated several previous commits ← that does not actually cause problems
20171130 09:26:49< JyrkiVesterinen> Nah, I want to stay as close to the typical pull request workflow as possible.
20171130 09:27:16< AI0867> git merge is smart enough to figure this stuff out
20171130 09:27:29< JyrkiVesterinen> The typical workflow is that the PR author rebases his own branch to rewrite history, and afterwards a developer merges the branch to master.
20171130 09:28:10< vultraz> yes. the Merge button is available
20171130 09:28:15< vultraz> but the Rebase and Merge button IS NOT
20171130 09:28:15< vn971> AI0867: that too, but I think it's important enough to agree on that `merge` cannot duplicate commits first anyway.
20171130 09:28:20< vultraz> and that's unacceptable
20171130 09:29:09< vultraz> we use Rebase and Merge frequently
20171130 09:29:17< vultraz> what, do you expect us to do manual rebases forever?
20171130 09:29:18< AI0867> and you're sure this is the cause?
20171130 09:29:22< vultraz> or only do Merge?
20171130 09:29:26< vn971> well, there is no point in doing rebase and merge. If you rebased on top of master, then the merge would be fast-forward anyway (just make the latest commit be the master branch).
20171130 09:30:07< JyrkiVesterinen> vn971: First, almost no one rebases their branch right before merging.
20171130 09:30:33< JyrkiVesterinen> And second, I believe Git/GitHub would generate a merge commit even in that case.
20171130 09:31:05< vn971> JyrkiVesterinen: yes, agree on that. If you write your branch (feature) for long, it makes sense to rebase on master from time to time. At least while it goes w/o conflicts.
20171130 09:31:24< vultraz> AI0867: when i changed the base of your PR to the fixed-master branch, this weird "cannot rebase" message on GH went away to be replaced by the usual conflicts list (and hundreds of extra commits). The latter can be fixed by a *manual* rebase (which you would absolutely have to do), but the main issue of GH saying "fuck it we can't rebase at all since the results are different from a merge" seems to be gone
20171130 09:31:34-!- irker558 [~irker@uruz.ai0867.net] has joined #wesnoth-dev
20171130 09:31:34< irker558> wesnoth: pentarctagon wesnoth:test-master 8bfbc7979ee6 / CMakeLists.txt SConstruct src/CMakeLists.txt src/SConscript: Have scons and cmake link against same static libraries. https://github.com/wesnoth/wesnoth/commit/8bfbc7979ee61807c553afe1d50a6306a8ef1034
20171130 09:31:36< irker558> wesnoth: Charles Dang wesnoth:test-master 46e3e154a5f3 / src/ (121 files in 23 dirs): Massive cleanup of GUI2 display/show and execute functions implementations and r https://github.com/wesnoth/wesnoth/commit/46e3e154a5f3e4a2a05a14db9a2f7f8e832d588e
20171130 09:31:39< irker558> wesnoth: Charles Dang wesnoth:test-master 9b8e32208e51 / src/tests/gui/test_gui2.cpp: Update tests for 335ffa1b8100 https://github.com/wesnoth/wesnoth/commit/9b8e32208e51e915d326a9f08e3827e77f8932c2
20171130 09:31:41< AI0867> actually, if this commit is 10 days old, then it can't be the cause, because my branch diverged only 8 days ago
20171130 09:31:42< vultraz> vn971: you fix conflicits *while* rebasing
20171130 09:31:42< irker558> wesnoth: Charles Dang wesnoth:test-master 4e6f50f87cf0 / src/ (9 files in 3 dirs): Fix Travis GCC warnings for f2b31ba082e1 https://github.com/wesnoth/wesnoth/commit/4e6f50f87cf09fce1ea996c3145739c3e9156490
20171130 09:31:45< irker558> wesnoth: Charles Dang wesnoth:test-master c67cb9c41e5f / src/ (13 files in 4 dirs): Dropped CVideo parameter from loading screen and prefs display functions (missed https://github.com/wesnoth/wesnoth/commit/c67cb9c41e5f1e5cdd4362f63c75edce14b871e5
20171130 09:31:48< irker558> wesnoth: Charles Dang wesnoth:test-master c0749a934f0f / src/ (23 files in 4 dirs): Cleaned up the mess of CVideo references passed around the game initialization p https://github.com/wesnoth/wesnoth/commit/c0749a934f0f656fe5dbe0d5c23ee6dfcff64523
20171130 09:31:51< vn971> JyrkiVesterinen: while I agree, what do you mean exactly? I mean, yes, some people rebase not right before merge. And what?
20171130 09:31:51< irker558> wesnoth: Charles Dang wesnoth:test-master d23f15f79c85 / src/ (44 files in 11 dirs): Cleaned up more unnecessary CVideo function arguments and class members https://github.com/wesnoth/wesnoth/commit/d23f15f79c85b176ebc80b17e02849fa338f83e6
20171130 09:31:54< irker558> wesnoth: Charles Dang wesnoth:test-master 9326d02c0e57 / src/gui/dialogs/multiplayer/lobby.cpp: Fixup b46a64b8ad7a (forgot to commit this bit) https://github.com/wesnoth/wesnoth/commit/9326d02c0e57f0c9c71f4e34953c43160c5606ef
20171130 09:31:56< vultraz> SOMEONE SILENCE IRKER
20171130 09:31:57< irker558> wesnoth: Charles Dang wesnoth:test-master 80711feb4430 / src/ (actions/advancement.cpp game_events/pump.cpp replay.cpp): Use CVideo::get_singleton() over resources::screen->video() https://github.com/wesnoth/wesnoth/commit/80711feb4430511c2318814541740b3c78839ce2
20171130 09:32:00< irker558> wesnoth: Gregory A Lundberg wesnoth:test-master 889a912ff0cc / src/tests/ (gui/test_gui2.cpp test_mp_connect.cpp utils/fake_display.cpp): Still _more_ CVideo fixes https://github.com/wesnoth/wesnoth/commit/889a912ff0ccedec2a8d475874a80f5e04cfec51
20171130 09:32:02< irker558> wesnoth: Gregory A Lundberg wesnoth:test-master ae58887d15f6 / src/ (5 files in 3 dirs): Autodoc cleanup for CVideo mess https://github.com/wesnoth/wesnoth/commit/ae58887d15f6a75285e1994b9fa08193513817b2
20171130 09:32:04< irker558> wesnoth: Charles Dang wesnoth:test-master ee6f7d2bf926 / src/ (video.cpp video.hpp): CVideo: formatting and doc update https://github.com/wesnoth/wesnoth/commit/ee6f7d2bf92623e47b4cf98ec5843849b90ada74
20171130 09:32:07< irker558> wesnoth: Charles Dang wesnoth:test-master b71714bf100b / src/ (9 files in 3 dirs): CVideo/Display: cleaned up/slightly refactored a few things https://github.com/wesnoth/wesnoth/commit/b71714bf100b82a5b19e77756ffb306fd9db8bbe
20171130 09:32:10< irker558> wesnoth: Charles Dang wesnoth:test-master 805dd4365bd3 / src/ (game_display.cpp game_display.hpp): Game Display: removed unused create_dummy_display function https://github.com/wesnoth/wesnoth/commit/805dd4365bd3010f2dadf6605b9d4b6a8863eb2a
20171130 09:32:13< irker558> wesnoth: Jyrki Vesterinen wesnoth:test-master 81d8a8a04406 / src/font/ (pango/hyperlink.hpp text.cpp text.hpp): Rewrite the link detection code https://github.com/wesnoth/wesnoth/commit/81d8a8a0440646fbb6b369397bb0d0dc4bf9bfb0
20171130 09:32:15< irker558> wesnoth: Jyrki Vesterinen wesnoth:test-master da10a1130bc5 / src/serialization/string_view.hpp: Attempt to fix build with GCC 4.8 https://github.com/wesnoth/wesnoth/commit/da10a1130bc5902c20a4f2f53270e02d1d2e0d8a
20171130 09:32:17< irker558> wesnoth: Charles Dang wesnoth:test-master 7b3975150ec8 / data/core/images/terrain/off-map/ (alpha.png border.png): Fixed graphical artifacts appearing in Fake Map Border/Off Map terrains with SDL https://github.com/wesnoth/wesnoth/commit/7b3975150ec885bc55921c9ab2a456f73c4671ef
20171130 09:32:20< irker558> wesnoth: Charles Dang wesnoth:test-master 72614ebde885 / src/ (font/text.cpp sdl/utils.cpp video.cpp): Made use of SDL_CreateRGBSurfaceWithFormat* on SDL 2.0.6+ https://github.com/wesnoth/wesnoth/commit/72614ebde88532fb51a88fc2ab4278fb6644a5f3
20171130 09:32:23< irker558> wesnoth: Charles Dang wesnoth:test-master 298c211f6ca7 / src/ (12 files in 7 dirs): Cleaned up unnecessary video.hpp includes https://github.com/wesnoth/wesnoth/commit/298c211f6ca7e3fbff6316bac471911ff48b54e8
20171130 09:32:26< irker558> wesnoth: Alexander van Gessel wesnoth:test-master 0e76977bd1a1 / src/pathfind/pathfind.cpp: Remove negative index use-case https://github.com/wesnoth/wesnoth/commit/0e76977bd1a178b1bf8812ba11b53b7cf7096d17
20171130 09:32:28< irker558> wesnoth: Alexander van Gessel wesnoth:test-master bc584a1b1f7c / src/pathfind/pathfind.cpp: Assert that indexes are on board https://github.com/wesnoth/wesnoth/commit/bc584a1b1f7c3f31267990012dabecaa7cbc8539
20171130 09:32:30< irker558> wesnoth: Alexander van Gessel wesnoth:test-master 1c95bdf94bd6 / src/pathfind/pathfind.cpp: Make check earlier https://github.com/wesnoth/wesnoth/commit/1c95bdf94bd6a7903ef8cd788cfa5f69b0f03e75
20171130 09:32:32< irker558> wesnoth: Alexander van Gessel wesnoth:test-master dc8f95b13a74 / src/pathfind/pathfind.cpp: Convert indexes to unsigned https://github.com/wesnoth/wesnoth/commit/dc8f95b13a74cda555e6fb69894cb5bbe54f42ea
20171130 09:32:34< JyrkiVesterinen> vn971: My point is that Git can't fast-forward if there has been even one commit in master after the latest rebase.
20171130 09:32:34< irker558> wesnoth: Charles Dang wesnoth:test-master e34e0a5ba53e / src/ (gui/widgets/grid.hpp hotkey/hotkey_command.cpp hotkey/hotkey_command.hpp): Hotkeys: cleanup and simplification of hotkey_command list https://github.com/wesnoth/wesnoth/commit/e34e0a5ba53e3f9f08bf0c678f1014739073f1b1
20171130 09:32:37< irker558> wesnoth: pentarctagon wesnoth:test-master 016bcf595227 / CMakeLists.txt: Remove -rdynamic from the linker. https://github.com/wesnoth/wesnoth/commit/016bcf595227ee83e1f3ff21947e56dbf5822131
20171130 09:32:39< irker558> wesnoth: Jyrki Vesterinen wesnoth:test-master 9f007d09785e / src/hotkey/hotkey_command.hpp: Make hotkeys copyable again https://github.com/wesnoth/wesnoth/commit/9f007d09785efed6006afaae7158f96d9d24a8d8
20171130 09:32:41< irker558> wesnoth: Charles Dang wesnoth:test-master dfa8c88e1770 / src/ (wesnothd_connection.cpp wesnothd_connection.hpp): Wesnothd Connection: formatting cleanup https://github.com/wesnoth/wesnoth/commit/dfa8c88e1770f346a781a7c60b247b50cab07dfd
20171130 09:32:44< irker558> wesnoth: Alexander van Gessel wesnoth:test-master 77a590f202f3 / src/serialization/string_view.hpp: Bump minimum boost version for external string_view https://github.com/wesnoth/wesnoth/commit/77a590f202f369c2d3b388fa8775272921ef5d65
20171130 09:32:46< irker558> wesnoth: Alexander van Gessel wesnoth:test-master 681d9768da53 / src/serialization/string_view.hpp: >= 1.64, not > 1.64 https://github.com/wesnoth/wesnoth/commit/681d9768da53f83e79e2036b7e17ce7dd6f8e09b
20171130 09:32:48< irker558> wesnoth: sigurdfdragon wesnoth:test-master 8b526687ee94 / data/campaigns/Secrets_of_the_Ancients/utils/sota-utils.cfg: SotA: Fix and improve freeze/thaw unit implementation https://github.com/wesnoth/wesnoth/commit/8b526687ee94b6cb274164b815def29f42b8b7cc
20171130 09:32:50< irker558> wesnoth: sigurdfdragon wesnoth:test-master d6d15e481738 / data/lua/wml/objectives.lua: WML: Add [show_if] usage in [objectives] subtag [gold_carryover] https://github.com/wesnoth/wesnoth/commit/d6d15e481738d3533c7daab6576dc13edbf67a3e
20171130 09:32:52< irker558> wesnoth: sigurdfdragon wesnoth:test-master 44a7f7319c63 / changelog: update changelog https://github.com/wesnoth/wesnoth/commit/44a7f7319c63c3fcfb2b6828b11c70ffa570aece
20171130 09:32:54< irker558> wesnoth: Charles Dang wesnoth:test-master 9d624cfc67b9 / src/ (23 files in 8 dirs): Fixed a bunch of log output and code comment typos https://github.com/wesnoth/wesnoth/commit/9d624cfc67b927be760e5e5f377fec6a068fde3e
20171130 09:32:58< vn971> vultraz: when you fix conflicts *while* rebasing, you might do it wrong and there would be no history left to fix. Anyway, you're right, that's a possibility. That's not best practices, but that's a possibility.
20171130 09:32:58< irker558> wesnoth: kallaballa wesnoth:test-master 9fd4b6ee7a83 / src/ (4 files): replaced recieve with receive https://github.com/wesnoth/wesnoth/commit/9fd4b6ee7a8395eaf8b94b5061695ae4f327d868
20171130 09:32:59< irker558> wesnoth: Gregory A Lundberg wesnoth:test-master 2337ef90c95b / src/scripting/lua_kernel_base.cpp: Fix wesnoth.print https://github.com/wesnoth/wesnoth/commit/2337ef90c95b0047f6a28acb73cf7b378ed327c7
20171130 09:33:00< AI0867> 10:30 < JyrkiVesterinen> And second, I believe Git/GitHub would generate a merge commit even in that case. ← yes, typically, merge buttons use the --no-ff option, so they always generate merge commits. AS THEY SHOULD
20171130 09:33:01< irker558> wesnoth: Gregory A Lundberg wesnoth:test-master d867a16b6371 / CMakeLists.txt: Fix typos in ad01dbd404e092e258fece5d1ad473fea1717d12 https://github.com/wesnoth/wesnoth/commit/d867a16b6371724676456baa9abc31fc4c8f35e6
20171130 09:33:03< irker558> wesnoth: Nils Kneuper wesnoth:test-master 9f78f61d00ad / utils/pofix.py: fixed syntax error in pofix and "problem" https://github.com/wesnoth/wesnoth/commit/9f78f61d00add15fdf1d0e33808f2de053b03906
20171130 09:33:05< irker558> wesnoth: Nils Kneuper wesnoth:test-master 106b80a3d2f7 / / (18 files in 17 dirs): updated Spanish translation https://github.com/wesnoth/wesnoth/commit/106b80a3d2f7249fd4d27c01ea8866cb641e1cd6
20171130 09:33:08< irker558> wesnoth: Charles Dang wesnoth:test-master 7c0de7612d3b / src/game_initialization/mp_game_utils.cpp: MP Game Utils: formatting and minor code cleanup https://github.com/wesnoth/wesnoth/commit/7c0de7612d3bf3a273ecb2bd4d3b95189c9b15bc
20171130 09:33:10< irker558> wesnoth: Charles Dang wesnoth:test-master 16f947dd70de / src/ (7 files in 2 dirs): MP Game Settings: removed show_connect member https://github.com/wesnoth/wesnoth/commit/16f947dd70de4de4fc21e6820335f5ad10a9fd4b
20171130 09:33:13< irker558> wesnoth: Charles Dang wesnoth:test-master 9ce2d886f185 / src/ (3 files in 2 dirs): Cleaned up SP initialization function parameters https://github.com/wesnoth/wesnoth/commit/9ce2d886f185a83c56feefaaa099d759afcf9f1d
20171130 09:33:16< irker558> wesnoth: Charles Dang wesnoth:test-master bf3712c61d06 / src/game_initialization/ (create_engine.cpp create_engine.hpp): Create Engine: keep a member reference to the game config https://github.com/wesnoth/wesnoth/commit/bf3712c61d0665bdb28d8379249d7ae887b6c491
20171130 09:33:20< irker558> wesnoth: Charles Dang wesnoth:test-master 3a819a1dca5d / src/gui/ (6 files in 4 dirs): GUI2: changed hotkey callback return value to void https://github.com/wesnoth/wesnoth/commit/3a819a1dca5df53383a3c840cf8ec7450727b2b7
20171130 09:33:23< irker558> wesnoth: Charles Dang wesnoth:test-master daab63e4b694 / src/gui/dialogs/ (title_screen.cpp title_screen.hpp): Title Screen: minor refactoring to button callback registering https://github.com/wesnoth/wesnoth/commit/daab63e4b694adc85888bd0cd609ecef57f346f9
20171130 09:33:24< vn971> damn, can we ban irker558 for 5 minutes?
20171130 09:33:26< irker558> wesnoth: loonycyborg wesnoth:test-master fbb4625faf5e / src/ (network_asio.cpp network_asio.hpp): Move asio streambufs in network_asio::connection into unique_ptrs https://github.com/wesnoth/wesnoth/commit/fbb4625faf5e73f3d4b209961a8672b2e8f66440
20171130 09:33:28< irker558> wesnoth: mattsc wesnoth:test-master 9fcac991ef03 / projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj: Update Xcode project https://github.com/wesnoth/wesnoth/commit/9fcac991ef03ee69c3af1f4a6281287184afa1cc
20171130 09:33:30< irker558> wesnoth: pentarctagon wesnoth:test-master 4c9d5a66978f / .travis.yml CMakeLists.txt SConstruct src/CMakeLists.txt src/SConscript: Make strict builds consistent between scons and cmake https://github.com/wesnoth/wesnoth/commit/4c9d5a66978f0ea7794f91a213c39563368ce025
20171130 09:33:32< irker558> wesnoth: Gregory A Lundberg wesnoth:test-master 3fce40c55d93 / src/gui/dialogs/title_screen.cpp: Fix compile errors https://github.com/wesnoth/wesnoth/commit/3fce40c55d93bc31b29cc78e85e3c5379dd24f10
20171130 09:33:34< irker558> wesnoth: pentarctagon wesnoth:test-master 755caba9d3af / CMakeLists.txt src/CMakeLists.txt: Remove MSVC support from cmake. https://github.com/wesnoth/wesnoth/commit/755caba9d3af4bd0be1b4d7176bf8d80e5c4a790
20171130 09:33:36< irker558> wesnoth: pentarctagon wesnoth:test-master 3a99275611e8 / CMakeLists.txt: Remove ENABLE_TOOLS and ENABLE_SDL2_TOOLS from cmake. https://github.com/wesnoth/wesnoth/commit/3a99275611e882d4366f344470b0380dcce867c9
20171130 09:33:38< irker558> wesnoth: doofus-01 wesnoth:test-master 869da27da2ac / data/campaigns/Under_the_Burning_Suns/ (7 files in 2 dirs): updating Ixthala Demon unit (#2240) https://github.com/wesnoth/wesnoth/commit/869da27da2acd102b5c1f7b624721e0241f5053a
20171130 09:33:40< irker558> wesnoth: Jyrki Vesterinen wesnoth:test-master 42d358c73d75 / src/playmp_controller.cpp: Stop explicitly redrawing in playmp_controller::play_human_turn() https://github.com/wesnoth/wesnoth/commit/42d358c73d75428261e57571be305ece1b339a69
20171130 09:33:42< irker558> wesnoth: Jyrki Vesterinen wesnoth:test-master fecdeb140e1b / changelog players_changelog src/display.cpp src/display.hpp src/sdl/surface.hpp: Miscellaneous optimizations in display::get_terrain_images() https://github.com/wesnoth/wesnoth/commit/fecdeb140e1baf05aae7f0e4ad01298ff61936f2
20171130 09:33:44< irker558> wesnoth: Charles Dang wesnoth:test-master bbdf9a99bfec / src/gui/core/event/ (dispatcher.cpp dispatcher.hpp handler.cpp): Fixed regression in 8bf95ce69a9bd59 (fixes #2245) https://github.com/wesnoth/wesnoth/commit/bbdf9a99bfecae499fcea2722b4786356992a4fc
20171130 09:33:47< irker558> wesnoth: Charles Dang wesnoth:test-master a8d9a9707c5a / src/ (11 files in 6 dirs): Cleaned up various areas of code related to setting window resolution https://github.com/wesnoth/wesnoth/commit/a8d9a9707c5aea711a019519530b4b72b73c9f33
20171130 09:33:50< irker558> wesnoth: Jyrki Vesterinen wesnoth:test-master 28b880afe9e6 / src/gui/core/event/dispatcher.cpp: An year has less than 27 months https://github.com/wesnoth/wesnoth/commit/28b880afe9e6bcac39bce962f644119bc80d73c5
20171130 09:33:52< irker558> wesnoth: Jyrki Vesterinen wesnoth:test-master 15a583819df1 / src/gui/dialogs/preferences_dialog.cpp: Fix a copy-paste mistake https://github.com/wesnoth/wesnoth/commit/15a583819df1a64d870a397464f4c292044ce92e
20171130 09:33:54< irker558> wesnoth: lundberg wesnoth:test-master ad763997b76d / projectfiles/VC12/wesnothd.vcxproj: Update VC12 project for wesnothd https://github.com/wesnoth/wesnoth/commit/ad763997b76d3ecd1ecc9cbc041586353f37cdcf
20171130 09:33:56< irker558> wesnoth: Charles Dang wesnoth:test-master 3b9d512e1986 / / (7 files in 4 dirs): Tests: removed empty files https://github.com/wesnoth/wesnoth/commit/3b9d512e1986f1548a4467d2f49391537813816e
20171130 09:33:59< irker558> wesnoth: Charles Dang wesnoth:test-master 349e44affcaf / source_lists/boost_unit_tests src/tests/gui/test_save_dialog.cpp: Tests: removed another empty file I missed in c93aebb1debc https://github.com/wesnoth/wesnoth/commit/349e44affcafd01e38bbc066b0fd81301c445061
20171130 09:34:02< irker558> wesnoth: Severin Glöckner wesnoth:test-master 2ada43c151e9 / / (12 files in 9 dirs): desktop_entry: include high resolution icons https://github.com/wesnoth/wesnoth/commit/2ada43c151e96e9f0ce855ca02de6286cb9505fe
20171130 09:34:04< irker558> wesnoth: Charles Dang wesnoth:test-master 49b9961a6cec / src/hotkey/ (command_executor.cpp command_executor.hpp): Hotkey/Command Executor: removed get_video() member in favor of singleton https://github.com/wesnoth/wesnoth/commit/49b9961a6cec336439012eaa418e11c3f67fc79d
20171130 09:34:07< irker558> wesnoth: Charles Dang wesnoth:test-master 06a2a9b0013c / src/ (display.cpp display.hpp): Display: one (hopefully) significant optimization and one minor one https://github.com/wesnoth/wesnoth/commit/06a2a9b0013ce6a7e0131f1a5fd5fd6cfc61e15c
20171130 09:34:10< irker558> wesnoth: Jeffrey 'Sigurd' Westcoat wesnoth:test-master 73a684bf8343 / data/core/macros/items.cfg: Macros: Tweak sceptre damage for story reasons (#2220) https://github.com/wesnoth/wesnoth/commit/73a684bf83434421bbeaff4f324b4feabda0f2a8
20171130 09:34:12< irker558> wesnoth: mattsc wesnoth:test-master 2bc7c12cddea / data/ai/micro_ais/engines/priority_target_engine.lua: Protect Unit Micro AI: fix typo/bug in AI aspect change https://github.com/wesnoth/wesnoth/commit/2bc7c12cddea25270358f6a89f47b63e379eea12
20171130 09:34:14< irker558> wesnoth: Charles Dang wesnoth:test-master 6afee1f058b3 / src/ (16 files in 5 dirs): Cleaned up unnecessary drawing calls https://github.com/wesnoth/wesnoth/commit/6afee1f058b33ce608265ec43cb9485aec214fb6
20171130 09:34:17< irker558> wesnoth: lundberg wesnoth:test-master 44d13abb7066 / packaging/windows/ (wesnoth.rc wesnothd.rc): Fix copyright defect and add missing icon https://github.com/wesnoth/wesnoth/commit/44d13abb70669c14a5d63e3829a2b487da42a8e4
20171130 09:34:19< irker558> wesnoth: Charles Dang wesnoth:test-master 040764a98e4f / src/gui/widgets/window.cpp: GUI2/Window: don't constantly send useless DRAW events to the queue https://github.com/wesnoth/wesnoth/commit/040764a98e4f0ac16f4c21c71f78feb58eada1a9
20171130 09:34:22< irker558> wesnoth: sigurdfdragon wesnoth:test-master 282bcb479b48 / data/campaigns/Delfadors_Memoirs/scenarios/19_Showdown_in_the_Northern_Swamp.cfg: DM S19: Rebalance scenario for a more exciting battle https://github.com/wesnoth/wesnoth/commit/282bcb479b48e55ffb6492274659a1b3d7c2e144
20171130 09:34:24< irker558> wesnoth: sigurdfdragon wesnoth:test-master 876b6f0819a3 / data/campaigns/Delfadors_Memoirs/scenarios/19_Showdown_in_the_Northern_Swamp.cfg: DM S19: Fix carryover report https://github.com/wesnoth/wesnoth/commit/876b6f0819a3d7c4ae992429ffed455111ae170c
20171130 09:34:26< irker558> wesnoth: sigurdfdragon wesnoth:test-master faefab50095c / changelog players_changelog: Update changelogs https://github.com/wesnoth/wesnoth/commit/faefab50095c118bf1953696659e7e64806a3291
20171130 09:34:28< irker558> wesnoth: Jyrki Vesterinen wesnoth:test-master bd14e5fd18f8 / src/attack_prediction.cpp: Fix #2251: possible crash when AI invokes attack prediction https://github.com/wesnoth/wesnoth/commit/bd14e5fd18f8c7482825da6be735d7ef4a0f61d6
20171130 09:34:30< irker558> wesnoth: Charles Dang wesnoth:test-master 15d3b4a714cb / src/ (8 files in 2 dirs): Game Events: refactored event handler storage https://github.com/wesnoth/wesnoth/commit/15d3b4a714cb53d0a6bcc8b9777c35486400cffb
20171130 09:34:32< vn971> * away till irker558 stops.
20171130 09:34:33< irker558> wesnoth: Charles Dang wesnoth:test-master 855a23a30c89 / src/game_events/handlers.cpp: Minor cleanup to 2045b6739e0f4e544 https://github.com/wesnoth/wesnoth/commit/855a23a30c8913a83417ef0ef0e49a0b906c272d
20171130 09:34:36< irker558> wesnoth: Gregory A Lundberg wesnoth:test-master 0d7a7615c7f5 / src/ (font/text.cpp serialization/string_view.hpp): Eliminate use of string_view::at https://github.com/wesnoth/wesnoth/commit/0d7a7615c7f55dc419c8d5f5c500e1ab020e369b
20171130 09:34:38< irker558> wesnoth: Gregory A Lundberg wesnoth:test-master c3e787bcfacd / join.lua: Fix mp_tests https://github.com/wesnoth/wesnoth/commit/c3e787bcfacda28b8ffb9bf9606f9be1f5368c6e
20171130 09:34:40< irker558> wesnoth: Jyrki Vesterinen wesnoth:test-master 72fba3f43350 / utils/travis/mp_test_executor.sh: Revert ignoring MP test failures due to video init failure (2e5c5da0036be2e68b42 https://github.com/wesnoth/wesnoth/commit/72fba3f433506ba77ca2271d13f421184b7dc777
20171130 09:34:42< irker558> wesnoth: Jeffrey 'Sigurd' Westcoat wesnoth:test-master 99067b2ce91b / data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg: HttT S17: Fix lava issues (#2249) https://github.com/wesnoth/wesnoth/commit/99067b2ce91ba7f36c3cdf84efe12896fcbf6dd5
20171130 09:34:44< irker558> wesnoth: Gregory A Lundberg wesnoth:test-master c338f4e2c447 / data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg: DiD S01 Fix bug: Allow undo https://github.com/wesnoth/wesnoth/commit/c338f4e2c447b6e1360e9c5c741444282f8cf53f
20171130 09:34:46< irker558> wesnoth: Gregory A Lundberg wesnoth:test-master d1e60205d238 / data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg: DiD S02 Cannot undo https://github.com/wesnoth/wesnoth/commit/d1e60205d2385f63f409b944340e06174c0e13b0
20171130 09:34:48< irker558> wesnoth: Gregory A Lundberg wesnoth:test-master 7128d033439c / data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg: DiD Remove variable artifacts https://github.com/wesnoth/wesnoth/commit/7128d033439cb28a2571b304c1d68337a34b4504
20171130 09:34:50< irker558> wesnoth: Gregory A Lundberg wesnoth:test-master 5efc55a31415 / data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg: DiD S02 Fix bug: Swamp only https://github.com/wesnoth/wesnoth/commit/5efc55a314157e940633b06e25846f834e1a50b5
20171130 09:34:52< irker558> wesnoth: Gregory A Lundberg wesnoth:test-master 64d998e5ae37 / data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg: DiD S04 Todo: Add snow https://github.com/wesnoth/wesnoth/commit/64d998e5ae37c202b1f02727fedbe4b901e676f6
20171130 09:34:54< irker558> wesnoth: Charles Dang wesnoth:test-master c29ef75d531e / src/game_events/ (handlers.cpp manager_impl.cpp): Game Events: fixed a few oversights in 056d7ac8f88c https://github.com/wesnoth/wesnoth/commit/c29ef75d531eb3f7e40c59554c1a4867bd456e90
20171130 09:34:57< irker558> wesnoth: Charles Dang wesnoth:test-master f6786aebef17 / src/game_events/manager_impl.cpp: Game Events: made use of some emplace_back when constructing handlers https://github.com/wesnoth/wesnoth/commit/f6786aebef17667c577562f9b23480f167161471
20171130 09:35:00< irker558> wesnoth: Charles Dang wesnoth:test-master bacf4f3860b2 / src/game_events/ (handlers.cpp handlers.hpp manager_impl.cpp): Game Events: ensure event names are properly standardized in the config https://github.com/wesnoth/wesnoth/commit/bacf4f3860b2897a10508247bd4821af02010313
20171130 09:35:03< irker558> wesnoth: Wedge009 wesnoth:test-master defb2dcecca9 / projectfiles/VC12/ (wesnoth.vcxproj wesnoth.vcxproj.filters): Remove header from VC project (deleted in 056d7ac8). https://github.com/wesnoth/wesnoth/commit/defb2dcecca9fa57b79d55bcd549672d7b9ef0cf
20171130 09:35:15< vultraz> vn971: why the hell do you keep talking about history history history
20171130 09:35:34< vultraz> manually fixing merge conflicts is a *common* thing when using git
20171130 09:36:12< vn971> vultraz: because things break from time to time, and it helps knowing what happened before in order to do an correct fix.
20171130 09:36:22< AI0867> vultraz: also, I strongly suspect that this problem is caused by some recent commit touching a lot of stuff, and that new PRs won't have this issue
20171130 09:36:37< vn971> Agree with AI0867.
20171130 09:37:03< AI0867> vultraz: and if you're doing this test-master thing because you intend to force-push to master, then I can only say DON'T
20171130 09:37:21< vultraz> yes I intend to force-push to master and fix this
20171130 09:38:15< vultraz> AI0867: what the hell do you propose otherwise
20171130 09:38:20< vultraz> NOT fix it?
20171130 09:38:38< AI0867> NOTHING IS BROKEN
20171130 09:39:03< vultraz> GITHUB CAN'T AUTOMATICALLY REBASE AND MERGE
20171130 09:39:39-!- Elsi [~Elsi@luwin.ulrar.net] has quit [Ping timeout: 240 seconds]
20171130 09:40:42< vultraz> That's an important tool we use
20171130 09:40:46< vn971> JyrkiVesterinen: yes, agree about fast-forward. Anyway, I'm just trying to explain why a "rebase&merge" github button would not "work".
20171130 09:40:48< vultraz> Why do you insist we do nothing
20171130 09:41:01< vn971> AI0867: please no caps though..
20171130 09:41:17< vn971> Please, no force-push!
20171130 09:41:44< AI0867> vultraz: all your fixes are worse than the problem
20171130 09:41:47< vultraz> The R&M button can sometimes be grayed out because of conflicts. That's true. And normal. And is resolved by a local rebase by the author and a force push to their feature branch.
20171130 09:42:00< vn971> it really, really breaks things for lots of people. Like, everyone who had a copy of the current master would be in a tough situation.
20171130 09:42:03< vultraz> However, now we're seeing a different "Cannot rebase since the result would be different than a merge" message
20171130 09:42:31< vn971> There would really, really be more problems after that move than there is now. Please at least confirm that auto-rebases aren't possible for new PR-s.
20171130 09:42:45< vultraz> Alright
20171130 09:43:02< vn971> ( if you do force-push, I guess auto-merge won't work either way. )
20171130 09:43:05< AI0867> vultraz: the main difference between normal conflicts and this type of conflict is that *the merge button still works*
20171130 09:43:30< AI0867> that is, rather than completely unable to merge, git can still figure it out as long as you don't insist on rebasing
20171130 09:43:35< vn971> vultraz: thanks.
20171130 09:43:35< AI0867> +being
20171130 09:44:06< AI0867> so this is not an indication that anything is broken, it's an indication that git merge is smart
20171130 09:44:40< vn971> AI0867: since vultraz agreed to wait until new PR-s coming, I think it makes sense to leave the issue as-is, for now.
20171130 09:44:50< JyrkiVesterinen> Disagree. Inabiility to auto-rebase *is* a sign that something is broken.
20171130 09:45:11< JyrkiVesterinen> And Git merge isn't smart. It just has an easier task than auto-rebase.
20171130 09:45:22< vn971> (And since I hope/think new PR-s will be fine. If they won't, I'd report to github BTW.)
20171130 09:45:49< JyrkiVesterinen> If Git merge were smart, it wouldn't have duplicated commits (or retained duplicated commits, whatever) when I merged #2208.
20171130 09:46:25< AI0867> JyrkiVesterinen: yes it would, because that's what its task is
20171130 09:46:26< vn971> JyrkiVesterinen: you wrote yourself that you did manual rebases, didn't you though? (I agree with some earlier statements, it's just about this one.)
20171130 09:46:42< JyrkiVesterinen> Yes, I rebased the branch before merging it.
20171130 09:46:45< AI0867> JyrkiVesterinen: its task is to make a make a single descendent out of multiple branches in a DAG
20171130 09:47:00< AI0867> and NOT remove any existing history
20171130 09:47:11< vultraz> Alright, a brand new PR has the R&M button enabled.
20171130 09:47:12< AI0867> the 'duplicate' commits are different, because they have different parents
20171130 09:47:42< vn971> JyrkiVesterinen: well this is your local history which nobody can check right now. I mean, if you just copied some lines in `git rebase -i`, then you could get duplicate commits.
20171130 09:47:44< vultraz> *ponders what to do*
20171130 09:48:05< vultraz> AI0867: please rebase your PR on current master and let's see what happens to the button
20171130 09:48:11< AI0867> vultraz: on a different note, squashing down those two commits on my PR would cost me quite a bit of work, as they both touch changes made in all 4 previous commits
20171130 09:48:16< AI0867> so I'd prefer not to squash them
20171130 09:48:28< vultraz> fine, don't squash
20171130 09:48:30< vultraz> but do rebase
20171130 09:50:07< vn971> great, problem solved, time to get back to Creep Wars.)  // I'm 99% certain rebases will work fine (even if with conflicts) etc.
20171130 09:50:13-!- Elsi [~Elsi@luwin.ulrar.net] has joined #wesnoth-dev
20171130 09:50:57< AI0867> rebased and force-pushed
20171130 09:51:24< vultraz> ALRIGHT the damn button is back.
20171130 09:51:39< AI0867> please don't rebase-merge. Those commits are signed
20171130 09:51:51< vultraz> alright
20171130 09:52:11< vultraz> I'm not merging it yet anyway since celmin left feedback
20171130 09:52:55< vultraz> I guess we don't need to fp 
20171130 09:53:03-!- Bonobo [~Bonobo@203.63.76.34] has quit [Ping timeout: 248 seconds]
20171130 09:53:08-!- atarocch [~atarocch@37.176.48.175] has joined #wesnoth-dev
20171130 09:55:03-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20171130 09:58:09< JyrkiVesterinen> vn971: No, I didn't copy lines in git rebase -i. I just reordered them to move Penta's commits together and squash them.
20171130 09:59:21-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Ping timeout: 240 seconds]
20171130 10:02:32-!- midzer_ [~quassel@2001:41d0:a:2255::1] has joined #wesnoth-dev
20171130 10:06:11-!- Elsi [~Elsi@luwin.ulrar.net] has quit [Ping timeout: 240 seconds]
20171130 10:08:32-!- yaiyan [~yaiyan@46.101.48.31] has quit [Ping timeout: 255 seconds]
20171130 10:10:04-!- Netsplit *.net <-> *.split quits: midzer, vultraz
20171130 10:11:44-!- yaiyan [~yaiyan@46.101.48.31] has joined #wesnoth-dev
20171130 10:15:30-!- Netsplit over, joins: vultraz
20171130 10:18:35< AI0867> JyrkiVesterinen: what I think happened there is that you had a branch, merged master into it (adding those commits to your branch) and then rebased it, reordering those commits, including commits that weren't originally from your branch
20171130 10:19:05< JyrkiVesterinen> Pentarctagon indeed merged master into static-libs before I merged it.
20171130 10:20:21< AI0867> well, merging master into a branch isn't really best practice, but merging the branch into master afterwards wouldn't duplicate commits
20171130 10:20:27< AI0867> the problem is the rebase in between
20171130 10:21:16< AI0867> that creates 'duplicate' commits on a "new branch" (same name, but not the same branch in the DAG)
20171130 10:21:34< AI0867> I think this is easier to explain by drawing things
20171130 10:22:19< JyrkiVesterinen> I hate that this kind of mess is even possible in Git.
20171130 10:22:35< JyrkiVesterinen> I have never faced similar problems with Subversion, for example.
20171130 10:23:08< AI0867> that's because rebasing is meaningless in subversion
20171130 10:23:12< AI0867> it does not actually track history
20171130 10:23:30< JyrkiVesterinen> If you ask me, that's a better approach.
20171130 10:23:40< AI0867> it also makes branching hell
20171130 10:24:05< AI0867> there are all sorts of hacks that make the branches act slightly more like proper branches
20171130 10:24:55< AI0867> you cannot sanely do branch→PR in svn, you'd simply have to mail patchsets or something equivalent
20171130 10:25:09< AI0867> (which, amusingly, is roughly equivalent to rebasing all your PRs)
20171130 10:25:16< JyrkiVesterinen> Right, the ability to make "pull requests" would be gone.
20171130 10:25:19< AI0867> that is, in fact, how rebase works
20171130 10:25:27< AI0867> *noninteractive rebase
20171130 10:25:32< JyrkiVesterinen> Yet, I'd still happily take that option.
20171130 10:25:41< AI0867> it generates a patchset, and then replays that on the new parent
20171130 10:25:48< AI0867> I wouldn't
20171130 10:26:36< AI0867> I find most problems stem from a lack of understanding combined with reckless use of dangerous commands
20171130 10:27:12< JyrkiVesterinen> Im my opinion, the problem is Git's underlying design.
20171130 10:27:22< AI0867> which part of it, the branching?
20171130 10:27:29< JyrkiVesterinen> Merging and rebasing, both common use cases, lead to commit duplication.
20171130 10:27:39< AI0867> merging does not
20171130 10:27:53< AI0867> but it does have to generate a new HEAD for the branch
20171130 10:28:02< JyrkiVesterinen> Well, merging results in both original and duplicated commits being in the same branch.
20171130 10:28:17< AI0867> there wouldn't be duplicated commits without the rebasing
20171130 10:28:39< AI0867> if the commits haven't been rebased, they're "already merged"
20171130 10:28:59< AI0867> that is, part of the master is already an ancestor of the feature branch
20171130 10:29:08< AI0867> you can see this in a proper git graph
20171130 10:29:18< AI0867> (I prefer gitk, but there are others)
20171130 10:29:26< JyrkiVesterinen> A second problem is that Git handles duplicated commits poorly - indeed, like we saw here, they may make auto-rebasing impossible.
20171130 10:29:41< AI0867> I rather doubt that they were the cause
20171130 10:30:04< AI0867> both branches before and after that specific merge had issues
20171130 10:30:26< JyrkiVesterinen> Yet another problem is Git's UI, which is absolutely terrible. When merging, it's difficult to keep track of what is being merged where. When resolving a merge conflict, it's hard to tell whether the changes should "already be there in this commit" or not.
20171130 10:30:49< AI0867> git diff will give you a 3-way diff
20171130 10:31:04< AI0867> and you can use history tools to tell when things changed
20171130 10:31:04< JyrkiVesterinen> Or the fact that after rebasing a branch locally, Git advises the user to *pull* the non-rebased upstream branch instead of force-pushing.
20171130 10:31:13< AI0867> um
20171130 10:31:38-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20171130 10:31:43< AI0867> that's just git push giving its standard advice when noticing that it is not a fast-forward
20171130 10:31:49< JyrkiVesterinen> 3-way diff is still difficult to use, for multiple reasons. One being the use of commit hashes, which makes it difficult to tell how old/new the commits are relative to each other.
20171130 10:31:56< AI0867> how is it supposed to know that you just rebased things?
20171130 10:32:27< JyrkiVesterinen> Look, I'm trying to have the PoV of the user in mind.
20171130 10:32:36< AI0867> a better idea might be to suggest force-pushing after rebasing, but I totally understand the reluctance to advise force-pushing
20171130 10:33:00< JyrkiVesterinen> If Git's tools can't tell what the user has done and end up giving incorrect advice as a result, it's a very strong sign that the underlying design is just wrong.
20171130 10:33:23< AI0867> git was designed to be fast, support branches, and be usable by kernel developers
20171130 10:33:35< AI0867> and distributed development of course
20171130 10:33:36< JyrkiVesterinen> That's a large part of the problem.
20171130 10:34:03< AI0867> it sounds like you want an all-in-one GUI tool
20171130 10:34:05< AI0867> those exist
20171130 10:34:09< vn971> * I personally stopped worrying about git/not git talks that much. It mainly just gets to the point that you should learn it instead of opposing it and that's all. Nobody's gonna go from decentralised to centralised source versioning anymore.
20171130 10:34:15< JyrkiVesterinen> With the advent of GitHub, a tool that was _only designed to be usable by Linux kernel developers_ is supposed to be used by any newbie programmer.
20171130 10:34:22< vn971> whether it's hard or not doesn't matter.
20171130 10:34:23< JyrkiVesterinen> That's a recipe for disaster.
20171130 10:34:33< AI0867> you just confused git and github
20171130 10:34:47< AI0867> or I misread what you wrote
20171130 10:34:51< AI0867> probably the latter
20171130 10:35:02< JyrkiVesterinen> Git GUIs have another large problem: they tend to hide the underlying design.
20171130 10:35:11< AI0867> well, I'm not a kernel dev, and I find it perfectly usable
20171130 10:35:16< AI0867> well yeah
20171130 10:35:27< AI0867> git supports many things
20171130 10:35:54< AI0867> and you can either allow the user to do all the things, which you cannot possibly fit in a nice simple GUI, or you can pick one or more workflows, and stick with them
20171130 10:36:02< JyrkiVesterinen> Thus, with a GUI the user has a rather poor idea of what is actually going on under the hood. Of course it works well in common cases, but in inevitable corner cases GUIs tend to be useless and just in the way.
20171130 10:36:55< JyrkiVesterinen> The *only* right way to deal with this problem is that the underlying design of the VCS must lead to a good user experience.
20171130 10:37:12< JyrkiVesterinen> Which is the case in Subversion, and even Team Foundation Server (which I have also used).
20171130 10:37:25< AI0867> well, all DVSs are based on graph theory. You can either learn the graph theory and how the DVCS builds on that, or you can use a workflow and a cheatsheet, and hope for the best
20171130 10:37:55< JyrkiVesterinen> Git's design is an overly complex mess, and making a usable user experience out of it is impossible.
20171130 10:38:20< AI0867> well, as I said earlier, branching on svn is hell, and you need access to the server to do anything useful
20171130 10:38:49< AI0867> svk was a solution to the latter, but basically forced everyone to rebase locally every time they pushed
20171130 10:38:51< JyrkiVesterinen> I have used Subversion and branches professionally in an earlier job position.
20171130 10:39:14< JyrkiVesterinen> We never got problems anywhere near as big as, well, like I had last month merging Penta's PR.
20171130 10:39:22< AI0867> I've had to merge huge wesnoth branches back when we were on svn
20171130 10:39:47< vn971> funny thing. lua>   attacks = wesnoth.unit_types["Mage"].attacks;  attacks[0].name  prints "Mage", attacks[1].name  prints "staff".
20171130 10:39:47< AI0867> it was very much not fun
20171130 10:40:09< AI0867> vn971: well, lua is 1-indexed
20171130 10:40:16< AI0867> I wonder what attacks[0] even means here
20171130 10:40:19< AI0867> or if this is UB
20171130 10:40:29< vn971> // When I tried to test attacks[2].name  I just got a SIGSEGV, reported here: https://github.com/wesnoth/wesnoth/issues/2253   But that's offtopic, what's funny is that the [0] indexing works
20171130 10:40:33< JyrkiVesterinen> I'd much rather merge a huge branch in SVN than in Git.
20171130 10:41:01< AI0867> it probably indexes whatever was further down the stack, or something like that
20171130 10:41:06< vn971> AI0867: yeah, that's the question. What is attacks[0], exactly? :D
20171130 10:41:18< AI0867> it might be the literal in the previous statement
20171130 10:41:23< vn971> AI0867: anything serious to worry about? no?
20171130 10:41:24< AI0867> or it might be the first member of the unit type
20171130 10:41:49< AI0867> I don't know enough about the lua VM to tell, but those would be my guesses
20171130 10:41:51< vn971> ideally should be fixed anyway, I think. I'll report it on github for visibility.
20171130 10:42:33< AI0867> vn971: you might want to add what you did. Just a backtrace isn't particularly useful
20171130 10:45:34< vn971> AI0867: IDK what I did, exactly.:D Though I managed to reproduce the bug just now. Can probably do it again until I find a strict instruction.
20171130 10:45:39< AI0867> anyway, using svn doesn't stop ignorance. back on svn we had someone who had a working copy on his main computer, copied stuff from there to his laptop, worked on his laptop for weeks, copied things back and then tried to commit
20171130 10:45:51< AI0867> with occasional updates on his desktop
20171130 10:46:02< AI0867> and whenever he got merge conflicts, he committed those too
20171130 10:46:52< JyrkiVesterinen> Yeah, very poor developemtn practices are possible with any VCS.
20171130 10:50:44-!- JyrkiVesterinen [~JyrkiVest@195-192-251-124.s1networks.fi] has quit [Quit: Lunch]
20171130 10:53:13< vn971> AI0867: UPD: reproduced. See the issue update.
20171130 10:54:56-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 248 seconds]
20171130 10:54:58< vn971> And this is the issue for `attacks[0]`  https://github.com/wesnoth/wesnoth/issues/2254  (which indeed returns the mage type itself)
20171130 11:06:37-!- ChipmunkV[m] [chipmunkvm@gateway/shell/matrix.org/x-datkkzpphgwxsyuj] has quit [Ping timeout: 255 seconds]
20171130 11:10:11-!- commavir [vir@2604:180::502b:135a] has quit [Ping timeout: 255 seconds]
20171130 11:11:10-!- commavir [vir@2604:180::502b:135a] has joined #wesnoth-dev
20171130 11:13:52-!- madmax28 [madmax28ma@gateway/shell/matrix.org/x-fegpdabcozblcthw] has quit [Ping timeout: 248 seconds]
20171130 11:14:09-!- zacklocx[m] [zacklocxma@gateway/shell/matrix.org/x-kbfypnhsqihbyppl] has quit [Ping timeout: 240 seconds]
20171130 11:14:10-!- NicolasF[m] [nicolasfma@gateway/shell/matrix.org/x-irlxcmeeuzxuizty] has quit [Ping timeout: 240 seconds]
20171130 11:14:10-!- Greg_Boggs[m] [gregboggsm@gateway/shell/matrix.org/x-kcgbtxwalejbubcr] has quit [Ping timeout: 264 seconds]
20171130 11:14:47-!- desttinghim[m] [desttinghi@gateway/shell/matrix.org/x-nrosppzdjckunmdl] has quit [Ping timeout: 264 seconds]
20171130 11:34:28-!- midzer_ is now known as midzer
20171130 11:40:42-!- JyrkiVesterinen [~JyrkiVest@195-192-251-124.s1networks.fi] has joined #wesnoth-dev
20171130 11:49:55-!- Bonobo [~Bonobo@203.63.76.34] has joined #wesnoth-dev
20171130 11:54:17-!- mesilliac [~mesilliac@p4FED3210.dip0.t-ipconnect.de] has joined #wesnoth-dev
20171130 12:15:42-!- fabi [~fabi@wesnoth/developer/fendrin] has quit [Quit: Konversation terminated!]
20171130 12:19:51< zookeeper> mesilliac, oh wow.
20171130 12:20:00< zookeeper> you've been gone for a long time.
20171130 12:27:44-!- Greg_Boggs[m] [gregboggsm@gateway/shell/matrix.org/x-hxwkpilpzzjtustp] has joined #wesnoth-dev
20171130 12:29:34< mesilliac> haha hey there zookeeper :)
20171130 12:29:56< mesilliac> i just figured i'd pop in and see how the project is going
20171130 12:33:43< zookeeper> still going...
20171130 12:35:18-!- irker558 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout]
20171130 12:36:45-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20171130 12:38:34< mesilliac> the game is looking good. The art is even better than i remember
20171130 12:40:12< zookeeper> well, when did you last look? it probably _is_ better now :P
20171130 12:40:28-!- travis-ci [~travis-ci@ec2-54-162-74-185.compute-1.amazonaws.com] has joined #wesnoth-dev
20171130 12:40:29< travis-ci> AI0867/wesnoth#58 (appveyor-test - d8ef06a : Alexander van Gessel): The build passed.
20171130 12:40:29< travis-ci> Build details : https://travis-ci.org/AI0867/wesnoth/builds/309449514
20171130 12:40:29-!- travis-ci [~travis-ci@ec2-54-162-74-185.compute-1.amazonaws.com] has left #wesnoth-dev []
20171130 12:41:05-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Ping timeout: 255 seconds]
20171130 12:44:02-!- higgins [~higgins@68.ip-149-56-14.net] has quit [Quit: Leaving]
20171130 12:48:08-!- desttinghim[m] [desttinghi@gateway/shell/matrix.org/x-tqbpzelymwzkdkwm] has joined #wesnoth-dev
20171130 12:48:08-!- zacklocx[m] [zacklocxma@gateway/shell/matrix.org/x-yrcgukvkwdtrkcbd] has joined #wesnoth-dev
20171130 12:48:08-!- madmax28 [madmax28ma@gateway/shell/matrix.org/x-rjzsdcxzpafqbesv] has joined #wesnoth-dev
20171130 12:48:08-!- ChipmunkV[m] [chipmunkvm@gateway/shell/matrix.org/x-dlrcvrmgmlfbtwdk] has joined #wesnoth-dev
20171130 12:48:17-!- NicolasF[m] [nicolasfma@gateway/shell/matrix.org/x-qvnqloyajgaxcpqz] has joined #wesnoth-dev
20171130 12:48:19< mesilliac> a long time ago :) i think kitty had just started making these awesome portraits that seem to be everywhere now. And yep there are a lot of improvements to the map graphics as well. It looks like somebody fixed my roads and made them better :)
20171130 12:51:48-!- travis-ci [~travis-ci@ec2-54-156-73-253.compute-1.amazonaws.com] has joined #wesnoth-dev
20171130 12:51:49< travis-ci> wesnoth/wesnoth#15855 (test-master - bacf4f3 : Charles Dang): The build passed.
20171130 12:51:49< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/309416614
20171130 12:51:49-!- travis-ci [~travis-ci@ec2-54-156-73-253.compute-1.amazonaws.com] has left #wesnoth-dev []
20171130 12:52:13-!- higgins [~higgins@68.ip-149-56-14.net] has joined #wesnoth-dev
20171130 12:52:39< zookeeper> yeah. are you looking at 1.12 or 1.13?
20171130 12:54:19-!- kallaballa [~amir@public.metalab.wien.funkfeuer.at] has joined #wesnoth-dev
20171130 13:01:33< mesilliac> It's 1.12. Is there some new stuff in dev?
20171130 13:05:47< AI0867> 1.12 was branched off in 2013
20171130 13:06:07< AI0867> there is new stuff, though I'm not sure how much artwork
20171130 13:08:35< zookeeper> quite a lot of new terrain art, at least.
20171130 13:19:15< mesilliac> oh, interesting! i'll check it out after i finish this quick campaign... :)
20171130 13:21:12< mesilliac> these days i'm as much interested in the code as the art, but i didn't know enough about it last time around
20171130 13:50:52-!- vultraz [uid24821@wesnoth/developer/vultraz] has quit [Quit: Connection closed for inactivity]
20171130 13:53:17-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20171130 13:59:02-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!]
20171130 14:04:42-!- Appveyor [~Appveyor@74.205.54.20] has joined #wesnoth-dev
20171130 14:04:42< Appveyor> The Battle for Wesnoth (Visual Studio 2013) - Release Alexander van Gessel de065c9: Change code style Failed
20171130 14:04:42< Appveyor> Details: https://ci.appveyor.com/project/wesnoth/wesnoth/build/Wesnoth-VS2013-master-793
20171130 14:04:47-!- Appveyor [~Appveyor@74.205.54.20] has left #wesnoth-dev []
20171130 14:13:05-!- Appveyor [~Appveyor@74.205.54.20] has joined #wesnoth-dev
20171130 14:13:05< Appveyor> The Battle for Wesnoth (Visual Studio 2013) - Debug Alexander van Gessel de065c9: Change code style Failed
20171130 14:13:05< Appveyor> Details: https://ci.appveyor.com/project/wesnoth/wesnoth/build/Wesnoth-VS2013-master-793
20171130 14:13:09-!- Appveyor [~Appveyor@74.205.54.20] has left #wesnoth-dev []
20171130 14:14:50-!- travis-ci [~travis-ci@ec2-54-162-74-185.compute-1.amazonaws.com] has joined #wesnoth-dev
20171130 14:14:51< travis-ci> AI0867/wesnoth#64 (appveyor-test - d49d008 : Alexander van Gessel): The build was canceled.
20171130 14:14:51< travis-ci> Build details : https://travis-ci.org/AI0867/wesnoth/builds/309527847
20171130 14:14:51-!- travis-ci [~travis-ci@ec2-54-162-74-185.compute-1.amazonaws.com] has left #wesnoth-dev []
20171130 14:43:27-!- atarocch [~atarocch@37.176.48.175] has quit [Read error: No route to host]
20171130 14:43:49-!- atarocch [~atarocch@37.176.48.175] has joined #wesnoth-dev
20171130 14:45:28-!- Appveyor [~Appveyor@67.225.139.254] has joined #wesnoth-dev
20171130 14:45:28< Appveyor> The Battle for Wesnoth (Visual Studio 2015) - Release Alexander van Gessel ee9d31d: Change code style Failed
20171130 14:45:28< Appveyor> Details: https://ci.appveyor.com/project/wesnoth/wesnoth-7lnpw/build/Wesnoth-VS2015-master-787
20171130 14:45:32-!- Appveyor [~Appveyor@67.225.139.254] has left #wesnoth-dev []
20171130 15:11:31-!- TadCarlucci [~lundberg@74.193.219.119] has joined #wesnoth-dev
20171130 15:17:55-!- Appveyor [~Appveyor@67.225.139.254] has joined #wesnoth-dev
20171130 15:17:55< Appveyor> The Battle for Wesnoth (Visual Studio 2015) - Debug Alexander van Gessel ee9d31d: Change code style Failed
20171130 15:17:55< Appveyor> Details: https://ci.appveyor.com/project/wesnoth/wesnoth-7lnpw/build/Wesnoth-VS2015-master-787
20171130 15:17:59-!- Appveyor [~Appveyor@67.225.139.254] has left #wesnoth-dev []
20171130 15:31:02-!- JyrkiVesterinen [~JyrkiVest@195-192-251-124.s1networks.fi] has quit [Quit: .]
20171130 15:44:01-!- nurupo [~nurupo.ga@unaffiliated/nurupo] has quit [Ping timeout: 240 seconds]
20171130 15:54:50-!- nurupo [~nurupo.ga@unaffiliated/nurupo] has joined #wesnoth-dev
20171130 15:59:07-!- Appveyor [~Appveyor@74.205.54.20] has joined #wesnoth-dev
20171130 15:59:07< Appveyor> The Battle for Wesnoth (Visual Studio 2017) - Release Alexander van Gessel ee9d31d: Change code style Failed
20171130 15:59:07< Appveyor> Details: https://ci.appveyor.com/project/wesnoth/wesnoth-605wt/build/Wesnoth-VS2017-master-487
20171130 15:59:12-!- Appveyor [~Appveyor@74.205.54.20] has left #wesnoth-dev []
20171130 16:12:25-!- Bonobo [~Bonobo@203.63.76.34] has quit [Ping timeout: 252 seconds]
20171130 16:43:59-!- Appveyor [~Appveyor@67.225.139.254] has joined #wesnoth-dev
20171130 16:43:59< Appveyor> The Battle for Wesnoth (Visual Studio 2017) - Debug Alexander van Gessel ee9d31d: Change code style Failed
20171130 16:43:59< Appveyor> Details: https://ci.appveyor.com/project/wesnoth/wesnoth-605wt/build/Wesnoth-VS2017-master-487
20171130 16:44:03-!- Appveyor [~Appveyor@67.225.139.254] has left #wesnoth-dev []
20171130 16:48:07-!- Nobun [~nobun@5.170.110.139] has joined #wesnoth-dev
20171130 16:54:21-!- atarocch [~atarocch@37.176.48.175] has quit [Ping timeout: 240 seconds]
20171130 16:58:01-!- vultraz [uid24821@wesnoth/developer/vultraz] has joined #wesnoth-dev
20171130 17:06:50-!- sevu [~Shiki@rzsl2.rz.htwk-leipzig.de] has joined #wesnoth-dev
20171130 17:08:56-!- JyrkiVesterinen [~JyrkiVest@85-23-197-3.bb.dnainternet.fi] has joined #wesnoth-dev
20171130 17:10:17-!- Oebele [~quassel@143.177.58.202] has joined #wesnoth-dev
20171130 17:14:05-!- irker783 [~irker@uruz.ai0867.net] has joined #wesnoth-dev
20171130 17:14:05< irker783> wesnoth: Charles Dang wesnoth:master dcd93bbd13f1 / src/save_index.cpp: Save Index: fixed leader TC coloring always being default (fixup ff5d68f9f57941) https://github.com/wesnoth/wesnoth/commit/dcd93bbd13f16e47579bfb1a4ea14c21e4781797
20171130 17:37:05-!- sigurdfd [sigurdfd@dynamic-acs-72-23-110-196.zoominternet.net] has joined #wesnoth-dev
20171130 17:47:41< irker783> wesnoth: Jyrki Vesterinen wesnoth:master 6cd2a9b7cd25 / src/scripting/lua_unit_attacks.cpp: Fix #2253: crash when accessing out-of-range attack from Lua https://github.com/wesnoth/wesnoth/commit/6cd2a9b7cd2528db7323b6592e22b42936977977
20171130 17:51:57-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20171130 18:28:56-!- sevu [~Shiki@rzsl2.rz.htwk-leipzig.de] has quit [Remote host closed the connection]
20171130 19:05:14-!- sinda [32f25ef1@gateway/web/freenode/ip.50.242.94.241] has joined #wesnoth-dev
20171130 19:20:13< vn971> Q: can I log lua output to wesnoth output (like wesnoth-1.12 did) ? Or maybe, to some other file? I'd like to see what's happening in lua w/o opening the console. Also, console is not copy-paste-able.
20171130 19:22:42< vultraz> there's a button to copy lua console output to clipboard
20171130 19:26:07< vn971> vultraz: indeed, thx. (If there's a way to write to stdout directly, plz write, too.)
20171130 19:26:31< vultraz> there is not that I know of
20171130 19:26:34< vultraz> live with it
20171130 19:27:19< vn971> "deal with it")  Y, ok.
20171130 19:27:32< kallaballa> wvn971: wesnoth --log-debug "scripting/lua"
20171130 19:28:03< kallaballa> it writes to stderr
20171130 19:28:54< vultraz> well, there you go
20171130 19:29:47-!- JyrkiVesterinen [~JyrkiVest@85-23-197-3.bb.dnainternet.fi] has quit [Quit: .]
20171130 19:29:56< vn971> kallaballa: cool, thanks! I remember you wrote something about it, but I thought "scripting" was something local folder you had. Cool.:)
20171130 19:30:08< kallaballa> :)
20171130 20:09:51-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Remote host closed the connection]
20171130 20:10:17-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20171130 20:11:48-!- Nobun [~nobun@5.170.110.139] has quit [Ping timeout: 268 seconds]
20171130 20:12:54-!- sigurdfd [sigurdfd@dynamic-acs-72-23-110-196.zoominternet.net] has quit []
20171130 20:14:35-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Ping timeout: 240 seconds]
20171130 20:25:33-!- kallaballa [~amir@public.metalab.wien.funkfeuer.at] has quit [Ping timeout: 250 seconds]
20171130 20:41:35-!- vladimirslavik [~vslavik@95.82.135.184] has quit [Quit: Leaving]
20171130 20:49:48-!- irker783 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout]
20171130 21:21:03-!- kallaballa [~amir@194-166-158-138.hdsl.highway.telekom.at] has joined #wesnoth-dev
20171130 21:38:11-!- kallaballa [~amir@194-166-158-138.hdsl.highway.telekom.at] has quit [Ping timeout: 240 seconds]
20171130 21:40:39-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20171130 22:01:44-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20171130 22:19:01-!- Oebele [~quassel@143.177.58.202] has quit [Remote host closed the connection]
20171130 22:29:30-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Remote host closed the connection]
20171130 22:30:25-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20171130 22:33:52-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20171130 22:42:45< mesilliac> hmm, the tutorial crashes on turn 4 with an `assert(false && "Found null handler in handler list!");`
20171130 22:43:11< vultraz> noooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
20171130 22:43:29< vultraz> or
20171130 22:43:30< vultraz> well
20171130 22:43:33< vultraz> actually, no
20171130 22:43:38< vultraz> that's not a game-breaking thing
20171130 22:43:45< vultraz> I probably shouldn't assert there anyway
20171130 22:44:04< vultraz> since the code ensures the handler isn't dereferenced if it's null
20171130 22:44:20< vultraz> though I'm curious why the cleanup stage hasn't happened at that point
20171130 22:45:36< vultraz> let us see..
20171130 22:46:40< vultraz> ponder ponder
20171130 22:47:01< mesilliac> well... :)
20171130 22:48:06< vultraz> (to be clear, I only added the assert since I assumed all the handlers would be valid)
20171130 22:48:24< vultraz> (it's an if(valid) { return ptr; } else { assert(); } block)
20171130 22:49:00< vultraz> which, I guess doesn't really make sense
20171130 22:49:02< vultraz> to do
20171130 22:51:02< mesilliac> should i chuck a bug report on github?
20171130 22:53:29-!- irker221 [~irker@uruz.ai0867.net] has joined #wesnoth-dev
20171130 22:53:29< irker221> wesnoth: Charles Dang wesnoth:master f17dcd419537 / src/game_events/manager.cpp: Game Events: removed assertion if weak event handler ptr fails to lock (fixup 05 https://github.com/wesnoth/wesnoth/commit/f17dcd419537bcdc657c738abdef7cc274093f26
20171130 22:53:33< vultraz> mesilliac: no need ^
20171130 22:55:12< vultraz> mesilliac: thanks for reporting 
20171130 22:57:32< mesilliac> that's gotta be a record on reporting -> fixing speed :)
20171130 22:58:10< vultraz> :)
20171130 22:58:16< mesilliac> (indeedi just checked it works now)
20171130 23:04:51-!- sinda [32f25ef1@gateway/web/freenode/ip.50.242.94.241] has quit [Quit: Page closed]
20171130 23:05:02< mesilliac> however now it crashes later... ohh this one's complicated
20171130 23:07:25< vultraz> oh fuck :(
20171130 23:07:44< vultraz> mesilliac: if it's complicated, raise a bug
20171130 23:10:07-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Remote host closed the connection]
20171130 23:10:38-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20171130 23:15:34-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Ping timeout: 268 seconds]
20171130 23:16:04-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20171130 23:19:47-!- Bonobo [~Bonobo@203.63.76.34] has joined #wesnoth-dev
20171130 23:33:03-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Remote host closed the connection]
20171130 23:33:29-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20171130 23:34:11-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Remote host closed the connection]
20171130 23:34:47-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20171130 23:36:40-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Remote host closed the connection]
20171130 23:38:53-!- travis-ci [~travis-ci@ec2-54-205-113-74.compute-1.amazonaws.com] has joined #wesnoth-dev
20171130 23:38:54< travis-ci> wesnoth/wesnoth#15860 (master - 6cd2a9b : Jyrki Vesterinen): The build has errored.
20171130 23:38:54< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/309633262
20171130 23:38:54-!- travis-ci [~travis-ci@ec2-54-205-113-74.compute-1.amazonaws.com] has left #wesnoth-dev []
20171130 23:39:01< mesilliac> I submitted a bug report with a backtrace. It seems maybe related, as it involves a remove_event_handler operation
20171130 23:43:03-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20171130 23:47:40< vultraz> well that's odd..
20171130 23:47:54< vultraz> looks like a use-after-free?
20171130 23:47:55< vultraz> or something?
20171130 23:48:38< vultraz> hmmmmm
20171130 23:48:40< vultraz> I have an idea..
20171130 23:48:47< vultraz> oh
20171130 23:48:54< vultraz> fucking hell, I'm an idiot
20171130 23:48:57 * vultraz kicks self
20171130 23:51:28-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection]
20171130 23:52:21-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Read error: Connection reset by peer]
20171130 23:52:33-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev
20171130 23:59:04< irker221> wesnoth: Charles Dang wesnoth:master 238a994429c2 / src/game_events/manager_impl.cpp: Fixup 2c12d1328ba6fc6 (don't try to dereference a nullptr) https://github.com/wesnoth/wesnoth/commit/238a994429c2cae9729800e2946e5dbad32a0502
20171130 23:59:06< vultraz> mesilliac: please test ^
--- Log closed Fri Dec 01 00:00:39 2017