--- Log opened Sun Oct 14 00:00:38 2018
20181014 00:39:26-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection]
20181014 01:11:56< celticminstrel> ...heh, I accidentally produced an amusing acronym in my master branch clone.
20181014 02:32:08-!- TC01 [~quassel@venus.arosser.com] has quit [Ping timeout: 244 seconds]
20181014 02:33:24-!- TC01 [~quassel@venus.arosser.com] has joined #wesnoth-dev
20181014 02:51:15-!- irker421 [~irker@wesnoth/umc-dev/bot/shikadibot] has quit [Quit: transmission timeout]
20181014 03:34:04-!- irker080 [~irker@wesnoth/umc-dev/bot/shikadibot] has joined #wesnoth-dev
20181014 03:34:04< irker080> wesnoth/wesnoth:1.14 josteph 8229e1a99c Update changelog for last commit AppVeyor: All builds passed
20181014 05:36:13< irker080> wesnoth/wesnoth:1.14 Iris Morelle 0b93eef3c8 wesnothd/fuh: Do not consider stale temp AppVeyor: All builds passed
20181014 06:00:23-!- celticminstrel is now known as celmin|sleep
20181014 06:14:24-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20181014 06:26:23-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev
20181014 07:06:58< irker080> wesnoth/wesnoth:master Iris Morelle 71a6daf961 wesnothd/fuh: Do not consider stale temp AppVeyor: All builds passed
20181014 07:31:54-!- wesdiscordbot [~wesdiscor@wesnoth/bot/discord-bridge] has joined #wesnoth-dev
20181014 07:31:57-!- mode/#wesnoth-dev [+v wesdiscordbot] by ChanServ
20181014 08:22:04-!- Oebele [~quassel@185-11-201-31.ftth.glasoperator.nl] has joined #wesnoth-dev
20181014 08:28:18<+wesdiscordbot> <Nobun> I can't see #haldric here in discord anymore... (that was the reason for me to use discord... following wesnoth 2.0 work progress...)
20181014 08:28:34<+wesdiscordbot> <Nobun> was it deleted?
20181014 08:32:32<+wesdiscordbot> <Vultraz> see other channel
20181014 08:35:44<+wesdiscordbot> <Nobun> thank 😃
20181014 08:40:54-!- Oebele [~quassel@185-11-201-31.ftth.glasoperator.nl] has quit [Ping timeout: 252 seconds]
20181014 08:51:46<+wesdiscordbot> <Vultraz> @Pentarctagon what if I create a new development branch forked from 1.14 and set it as the new default. We can still backport at our leisure, people can develop again, existing refs to master won't break, and this way we can still merge it into 1.14 if we decide to go rolling release.
20181014 08:52:29<+wesdiscordbot> <jyrkive> Why not use https://github.com/wesnoth/wesnoth/pull/3603 instead?
20181014 08:54:26<+wesdiscordbot> <Vultraz> I don't think that's suitable for merging into 1.14 at all. Unless we intend that to be 1.15.
20181014 08:55:04<+wesdiscordbot> <jyrkive> #3303 is intended to be 1.15, not 1.14.
20181014 08:55:35<+wesdiscordbot> <Pentarctagon> if we do go rolling release, I am 100% in favor of calling it 1.15 anyway.  switching to an entirely different release model and keeping it as 1.14.x is unnecessarily confusing.
20181014 08:57:10<+wesdiscordbot> <Vultraz> Fair enough. I agree. But I still say the new branch should be called development or something instead of being force-pushed to master. It can still be set to default.
20181014 08:57:26<+wesdiscordbot> <jyrkive> Sounds good to me.
20181014 08:59:40<+wesdiscordbot> <Pentarctagon> @josteph ^
20181014 09:00:46-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 272 seconds]
20181014 09:08:21-!- JyrkiVesterinen [~JyrkiVest@wesnoth/developer/jyrkive] has joined #wesnoth-dev
20181014 09:12:26<+wesdiscordbot> <Pentarctagon> (the correct josteph is #6338 by the way - there seem to be three jostephs at the moment)
20181014 09:13:45< irker080> wesnoth: Charles Dang wesnoth:development 43053105f358 / Doxyfile changelog.md players_changelog.md src/wesconfig.h: Post-release version bump https://github.com/wesnoth/wesnoth/commit/43053105f358e548a84b2667669cfe07048255b9
20181014 09:13:48< irker080> wesnoth: Jyrki Vesterinen wesnoth:development 4dd1437cef98 / / (35 files in 3 dirs): Update Visual Studio project file to VS2015 toolset https://github.com/wesnoth/wesnoth/commit/4dd1437cef982271ed756475fae41f01a7365f62
20181014 09:13:50< irker080> wesnoth: ln-zookeeper wesnoth:development 9b7e1ed38386 / data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Singer.cfg: UtBS: Corrected Sun Singer movetype from float to foot https://github.com/wesnoth/wesnoth/commit/9b7e1ed38386a8a60642b9c02919085727beaaa5
20181014 09:13:52< irker080> wesnoth: Charles Dang wesnoth:development 24cc0b01d436 / src/ (23 files in 7 dirs): Used constexpr and noexcept keywords directly https://github.com/wesnoth/wesnoth/commit/24cc0b01d4362a9dcb88a974f60f6f325a26b4b2
20181014 09:13:53<+wesdiscordbot> <jyrkive> All right, the branch has been created.
20181014 09:13:55< irker080> wesnoth: Charles Dang wesnoth:development 4f1c4dcafddd / src/ (8 files in 4 dirs): Used std::put time everywhere https://github.com/wesnoth/wesnoth/commit/4f1c4dcafddd67bc62aee3386f64eab86c2347fc
20181014 09:13:58< irker080> wesnoth: Charles Dang wesnoth:development 7785d711ed8d / src/ (12 files in 6 dirs): Removed the type trait alias wrappers https://github.com/wesnoth/wesnoth/commit/7785d711ed8d28a5937b024942e394c392b7c409
20181014 09:14:01< irker080> wesnoth: Charles Dang wesnoth:development 56406aeedc5b / src/ (font/text.cpp font/text.hpp gui/core/canvas.cpp gui/widgets/styled_widget.hpp): Added a getter for a static pango_text object https://github.com/wesnoth/wesnoth/commit/56406aeedc5b1e4cd69c6620ec947aee8a7f20e1
20181014 09:14:02<+wesdiscordbot> <Vultraz> @Pentarctagon are they all him?
20181014 09:14:04< irker080> wesnoth: Charles Dang wesnoth:development 0546b5162ff9 / src/image.cpp: Improved console output on IPF fail https://github.com/wesnoth/wesnoth/commit/0546b5162ff99b4a5809b44196ad717477f554a5
20181014 09:14:07< irker080> wesnoth: Jyrki Vesterinen wesnoth:development a2d5d159163f / src/hotkey/command_executor.cpp: Fix #2681: minimap buttons don't do anything https://github.com/wesnoth/wesnoth/commit/a2d5d159163f2a2e50661e1fe839a5d9396dc8ff
20181014 09:14:10< irker080> wesnoth: Celtic Minstrel wesnoth:development 8d1611c32233 / .gitignore: Update gitignore for VC project file update https://github.com/wesnoth/wesnoth/commit/8d1611c32233d28cd33affadb95905834f683d6e
20181014 09:14:11-!- mode/#wesnoth-dev [+o JyrkiVesterinen] by ChanServ
20181014 09:14:11< irker080> wesnoth: Sofartin wesnoth:development 0da9c0ab622c / projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj: Fixed Xcode Project for new Wesnoth 1.15 https://github.com/wesnoth/wesnoth/commit/0da9c0ab622c8da7f68ced6e0a3c418bcc140a92
20181014 09:14:13< irker080> wesnoth: Gregory A Lundberg wesnoth:development cc5fe2adc1ce / CMakeLists.txt SConstruct: Change SCons and CMake to C++14 https://github.com/wesnoth/wesnoth/commit/cc5fe2adc1ceba4c266f66c149499b31dd970400
20181014 09:14:15< irker080> wesnoth: pentarctagon wesnoth:development e8bce7762c7f / .travis.yml: Set travis use c++14. https://github.com/wesnoth/wesnoth/commit/e8bce7762c7fa1473f2c61a9392b627a9b712c87
20181014 09:14:17< irker080> wesnoth: Jyrki Vesterinen wesnoth:development efb193a44665 / .appveyor.vs2015.yml: Attempted fix for AppVeyor build failures on VS2015 https://github.com/wesnoth/wesnoth/commit/efb193a446655fdcb63cb4b5dd03de390f4fa34b
20181014 09:14:19< irker080> wesnoth: Gunter Labes wesnoth:development 5e0d9b3310a1 / src/server/server.cpp: Enable lobby message logging again https://github.com/wesnoth/wesnoth/commit/5e0d9b3310a12acf2ad012b9580ed067b8e03f1b
20181014 09:14:21< irker080> wesnoth: pentarctagon wesnoth:development 7f0827b848ef / CMakeLists.txt utils/travis/docker_run.sh: Stop hard-coding cmake's -std version. https://github.com/wesnoth/wesnoth/commit/7f0827b848ef2954586bb76e8e3fd9ca6303f8a9
20181014 09:14:23< irker080> wesnoth: Celtic Minstrel wesnoth:development ea63a148cb5d / doc/man/wesnoth.6: Document --log-none command line option https://github.com/wesnoth/wesnoth/commit/ea63a148cb5d55af5fa800291310a5c45ca9d5db
20181014 09:14:25< irker080> wesnoth: Celtic Minstrel wesnoth:development d849dfcf89d6 / data/advanced_preferences.cfg: Add the advanced prefs entry for the deprecation setting https://github.com/wesnoth/wesnoth/commit/d849dfcf89d6678b5b63e640aa6de8a9ca96db2d
20181014 09:14:27< irker080> wesnoth: Charles Dang wesnoth:development 2c623ecc9212 / src/gui/core/canvas.cpp: Used std::exchange for a thing https://github.com/wesnoth/wesnoth/commit/2c623ecc9212ca898e992a8aaa4fcf754cb1066e
20181014 09:14:30< irker080> wesnoth: Charles Dang wesnoth:development 45f871067f76 / src/ (325 files in 39 dirs): Use std::size_t everywhere instead of plain size_t https://github.com/wesnoth/wesnoth/commit/45f871067f76cad96f39acb5e37e236d30e9a3d7
20181014 09:14:33< irker080> wesnoth: Charles Dang wesnoth:development ec4967351a2c / projectfiles/VC14/ (wesnoth.vcxproj wesnoth.vcxproj.filters): Updated VS projectfile for recent changes https://github.com/wesnoth/wesnoth/commit/ec4967351a2cef9b20f65f92cb9efb3d30089e86
20181014 09:14:36< irker080> wesnoth: Sofartin wesnoth:development 7eb172b7e9db / projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj: Fix InfoPlist.strings encoding https://github.com/wesnoth/wesnoth/commit/7eb172b7e9db180965a8608bdfc889314be51931
20181014 09:14:38< irker080> wesnoth: Sofartin wesnoth:development 4f97d6794b40 / projectfiles/Xcode/ (README.md Wesnoth.xcodeproj/project.pbxproj): Fixed campaignd Xcode target https://github.com/wesnoth/wesnoth/commit/4f97d6794b40c538088622314377e0b9be59308c
20181014 09:14:40< irker080> wesnoth: lundberg wesnoth:development c04d542e554a / projectfiles/VC14/ (wesnoth.vcxproj wesnothd.vcxproj wesnothlib.vcxproj): Suppress upstream variable-hide-variable errors. https://github.com/wesnoth/wesnoth/commit/c04d542e554a8bc2e452e0ebb9dfff8acddfdda2
20181014 09:14:42< irker080> wesnoth: Jyrki Vesterinen wesnoth:development 21b1ea778c71 / src/hotkey/command_executor.cpp: Restore ability to recruit full keep of one unit by holding Ctrl+Alt+R https://github.com/wesnoth/wesnoth/commit/21b1ea778c71eecdfe6acd8b707b650e6809f466
20181014 09:14:44< irker080> wesnoth: Sofartin wesnoth:development 934c34f42626 / projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj: Fixed Xcode project https://github.com/wesnoth/wesnoth/commit/934c34f42626cb808e4c5e834b7244b110012e63
20181014 09:14:46< irker080> wesnoth: Wedge009 wesnoth:development 42fc801e4147 / projectfiles/VC14/ (5 files): Update VC project files. https://github.com/wesnoth/wesnoth/commit/42fc801e41471ea8093e6df57ca6cd3d42b9d095
20181014 09:14:48< irker080> wesnoth: Sofartin wesnoth:development b58003b5f86c / projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj: Fixed Xcode Project https://github.com/wesnoth/wesnoth/commit/b58003b5f86cfa4bfa205599bfa5107cc7db588d
20181014 09:14:50<+wesdiscordbot> <Vultraz> thanks for the push
20181014 09:14:50< irker080> wesnoth: Charles Dang wesnoth:development a082cf1493f4 / projectfiles/VC14/ (wesnoth.vcxproj wesnoth.vcxproj.filters): Updated VS projectfile for 5022a38 https://github.com/wesnoth/wesnoth/commit/a082cf1493f445c1fc9ddc5f787198281c4e19f6
20181014 09:14:53< irker080> wesnoth: gfgtdf wesnoth:development e14f712e7322 / INSTALL.md: update INSTALL.md for c++14 requirement https://github.com/wesnoth/wesnoth/commit/e14f712e732241495fb45bc6e0df4801b3bebe36
20181014 09:14:56-!- mode/#wesnoth-dev [+m] by JyrkiVesterinen
20181014 09:15:13<@JyrkiVesterinen> Irker quieted by setting the channel to moderated.
20181014 09:15:51<+wesdiscordbot> <Vultraz> Let's try to get a 1.15.0 out before the end of the year.
20181014 09:18:57<+wesdiscordbot> <Pentarctagon> I don't know.  I just know that one is definitely him since we've DMed.
20181014 09:20:04<+wesdiscordbot> <Vultraz> @josteph if the other 2 jostephs here are your alts, let me know if you want them kicked.
20181014 09:21:01-!- mode/#wesnoth-dev [-m] by JyrkiVesterinen
20181014 09:21:02< irker080> wesnoth: Nils Kneuper wesnoth:development 687d81850a95 / po/wesnoth-lib/pl.po: updated Polish translation https://github.com/wesnoth/wesnoth/commit/687d81850a951cb70e6eb5d9701d60badbdc405d
20181014 09:21:04< irker080> wesnoth: gfgtdf wesnoth:development 59cc2448dcc0 / data/lua/wml/message.lua: fix [message] side_for= not working for the last side. https://github.com/wesnoth/wesnoth/commit/59cc2448dcc0b4087a3cffcd89604eaf5c685d87
20181014 09:21:05-!- mode/#wesnoth-dev [+m] by JyrkiVesterinen
20181014 09:23:22<+wesdiscordbot> <Vultraz> new default branch set
20181014 09:23:54<+wesdiscordbot> <Pentarctagon> so now what remains is cherry-picking 1.14 commits to the development branch, if I'm understanding correctly?
20181014 09:24:02<+wesdiscordbot> <Pentarctagon> also updating travis and appveyor
20181014 09:24:22<+wesdiscordbot> <jyrkive> Development branch is based on master, so there shouldn't be much 1.14 exdclusive stuff.
20181014 09:26:56<+wesdiscordbot> <Pentarctagon> the iOS pr1, at least.  I think josteph mentioned there being a few hundred commits that would need to be double checked.
20181014 09:27:09<+wesdiscordbot> <Pentarctagon> https://github.com/wesnoth/wesnoth/pull/3603#issuecomment-427614568
20181014 09:29:36-!- mode/#wesnoth-dev [-m] by JyrkiVesterinen
20181014 09:29:37< irker080> wesnoth: Celtic Minstrel wesnoth:development d2bc5eb2f187 / utils/pofix.py: Fix pofix https://github.com/wesnoth/wesnoth/commit/d2bc5eb2f1871c40507cc7f5793d0ba9165fd0ad
20181014 09:29:39< irker080> wesnoth: Iris Morelle wesnoth:development 583e74b7d0f9 / po/wesnoth-sota/ (61 files): Run pofix for wesnoth-sota changes that were just fwd-ported to master https://github.com/wesnoth/wesnoth/commit/583e74b7d0f91e46553c75415045f3b9542e5ea4
20181014 09:29:40-!- mode/#wesnoth-dev [+m] by JyrkiVesterinen
20181014 09:41:41-!- travis-ci [~travis-ci@ec2-54-198-236-248.compute-1.amazonaws.com] has joined #wesnoth-dev
20181014 09:41:42-!- travis-ci [~travis-ci@ec2-54-198-236-248.compute-1.amazonaws.com] has left #wesnoth-dev []
20181014 09:46:38-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20181014 09:48:00-!- mode/#wesnoth-dev [-m] by JyrkiVesterinen
20181014 09:48:02< irker080> wesnoth: Charles Dang wesnoth:development 49908e5cb9e9 / data/campaigns/Northern_Rebirth/maps/ (5 files): NR S10 - 14: minor cosmetic map tweaks https://github.com/wesnoth/wesnoth/commit/49908e5cb9e910b9d5e8e2ac61550aeb2f65cc01
20181014 09:48:05-!- mode/#wesnoth-dev [+m] by JyrkiVesterinen
20181014 09:51:58<+wesdiscordbot> <Pentarctagon> well, I'll see about taking a look through the non-c++ 1.14-only commits sometime in the next week or so, if no one gets to it first.
20181014 09:52:10<+wesdiscordbot> <Pentarctagon> c++ obviously someone else will need to check
20181014 09:53:42<+wesdiscordbot> <Pentarctagon> also there've been some commits to master since josteph made his PR, like shadowm's fix earlier, so those will be needed too
20181014 09:54:47<+wesdiscordbot> <jyrkive> I cherry-picked those commits before I pusheed.
20181014 09:55:50-!- Oebele [~quassel@185-11-201-31.ftth.glasoperator.nl] has joined #wesnoth-dev
20181014 09:58:10-!- mode/#wesnoth-dev [-m] by JyrkiVesterinen
20181014 09:58:10< irker080> wesnoth: Nils Kneuper wesnoth:development 06423777b41e / / (5 files in 5 dirs): updated Hungarian translation https://github.com/wesnoth/wesnoth/commit/06423777b41e4aac9415c5c33cdc58d62f0506cd
20181014 09:58:12< irker080> wesnoth: Nils Kneuper wesnoth:development 9da2700f1015 / po/ (8 files in 8 dirs): updated Japanese translation https://github.com/wesnoth/wesnoth/commit/9da2700f101546ea78455a19860a2ed9d94ea824
20181014 09:58:14< irker080> wesnoth: DisherProject wesnoth:development d8d00911c478 / data/campaigns/Delfadors_Memoirs/scenarios/08_Ur_Thorodor.cfg: DM S08: Remove some (apparently) unused stuff https://github.com/wesnoth/wesnoth/commit/d8d00911c478ed30e3e78323dd210d55333fd872
20181014 09:58:15-!- irker080 was kicked from #wesnoth-dev by JyrkiVesterinen [irker080]
20181014 09:58:31<@JyrkiVesterinen> Good grief, irker was still going.
20181014 09:58:46<+wesdiscordbot> <Pentarctagon> heh
20181014 09:58:54<@JyrkiVesterinen> I can't just keep the channel moderated forever (and I need to go elsewhere now), so I kicked it.
20181014 09:59:05<@JyrkiVesterinen> loonycyborg, make sure to restart irker later.
20181014 09:59:11-!- JyrkiVesterinen [~JyrkiVest@wesnoth/developer/jyrkive] has quit [Quit: .]
20181014 10:00:03< loonycyborg> I'm not the one controlling irker
20181014 10:00:17< loonycyborg> but mere kick is unlikely to deter it for long anyway
20181014 13:03:48-!- Oebele [~quassel@185-11-201-31.ftth.glasoperator.nl] has quit [Ping timeout: 252 seconds]
20181014 13:15:40< celmin|sleep> IMO we should now delete the master branch.
20181014 13:15:52< celmin|sleep> (The commits are still there on a-r-a.)
20181014 13:16:25<+wesdiscordbot> <Vultraz> no.
20181014 13:16:30< celmin|sleep> Why?
20181014 13:16:37-!- celmin|sleep is now known as celticminstrel
20181014 13:16:55<+wesdiscordbot> <Vultraz> well, maybe. I'll consider the benfits.
20181014 13:16:59<+wesdiscordbot> <Vultraz> But not right now
20181014 13:18:01< celticminstrel> One benefit would be that people trying to update their master would get an error which should be able to signal that something has changed.
20181014 14:23:29-!- irker379 [~irker@wesnoth/umc-dev/bot/shikadibot] has joined #wesnoth-dev
20181014 14:23:29< irker379> wesnoth/wesnoth:development Iris Morelle 9c2bdf7ada wesnothd/fuh: Do not consider stale temp AppVeyor: 2/4 builds failed
20181014 14:23:29< irker379> Details vs2017/Release: https://ci.appveyor.com/project/wesnoth/wesnoth-605wt/builds/19494156
20181014 14:23:29< irker379> Details vs2015/Release: https://ci.appveyor.com/project/wesnoth/wesnoth-7lnpw/builds/19494157
20181014 14:32:16<+wesdiscordbot> <josteph> what other jostephs ?
20181014 14:32:35< celticminstrel> ???
20181014 14:32:49<+wesdiscordbot> <josteph> people mentioned there being three jostephs on discord
20181014 14:38:23<+wesdiscordbot> <josteph> so, fwdports
20181014 14:38:40<+wesdiscordbot> <josteph> anybody mind if I try to mass fwdport everything from 1.14 that isn't in development and merges cleanly?
20181014 14:38:57<+wesdiscordbot> <josteph> I'll open a bug report with whatever remains
20181014 14:39:08< celticminstrel> There are some things that probably shouldn't be.
20181014 14:39:17< celticminstrel> Like everything from schema.
20181014 14:39:27< celticminstrel> It could cause conflicts when schema is merged to master.
20181014 14:39:55< celticminstrel> (I thought you said you wanted someone else to do the forward ports? >_> )
20181014 14:40:12<+wesdiscordbot> <josteph> I don't mind doing a mass cherry pick of everything that merges cleanly
20181014 14:40:36<+wesdiscordbot> <josteph> It's probably more efficient for me to do so, and it won't take long
20181014 14:41:05<+wesdiscordbot> <josteph> but it sounds like "if it merges cleanly, pick it" is not a good strategy
20181014 14:57:08< irker379> wesnoth: newfrenchy83 wesnoth:1.14 a92619520af0 / projectfiles/CodeBlocks/libraries.md: Add Boost.Spirit to Code::Blocks Boost build instructions (#3612) https://github.com/wesnoth/wesnoth/commit/a92619520af04bfd079550fb695db75375572e3e
20181014 15:24:26-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev
20181014 15:38:39<+wesdiscordbot> <Pentarctagon> @josteph :
20181014 15:38:45<+wesdiscordbot> <Pentarctagon> https://cdn.discordapp.com/attachments/259976436490829825/501056273954111498/jostephs.png
20181014 15:39:11<+wesdiscordbot> <Pentarctagon> not quite sure how that 4th name matches, but oh well
20181014 15:39:36<+wesdiscordbot> <josteph> Odd
20181014 15:39:42<+wesdiscordbot> <josteph> So there are three different people using this nick?
20181014 15:39:54<+wesdiscordbot> <josteph> Or is that old versions of me when the browser didn't shut down cleanly or something
20181014 15:41:38<+wesdiscordbot> <Pentarctagon> no idea
20181014 15:41:59<+wesdiscordbot> <Pentarctagon> I don't think it's because the browser didn't shut down though
20181014 15:42:23<+wesdiscordbot> <josteph> @josteph @josteph Hi there
20181014 15:42:58<+wesdiscordbot> <josteph> No idea what to make of this. I should come up with an avatar or something
20181014 15:44:32<+wesdiscordbot> <Bitron> It's not the first time discord does that, so there's a good chance these are all your nicks.
20181014 15:46:25<+wesdiscordbot> <Pentarctagon> I'll just kick them
20181014 15:46:34<+wesdiscordbot> <Pentarctagon> if they show up again, we'll know
20181014 15:48:32<+wesdiscordbot> <josteph> thanks
20181014 15:57:19<+wesdiscordbot> <Pentarctagon> @josteph as far as mass cherry-picking, that might be a good thing to make as a PR against development.  I can for sure say that any travis commits wouldn't be needed from 1.14 though, for example, since I originally did most of those on master and then backported a few features once it became clear that master wouldn't be usable for a while.
20181014 15:57:31<+wesdiscordbot> <Pentarctagon> same with anything related to docker
20181014 15:58:25<+wesdiscordbot> <josteph> @Pentarctagon Hang on a few minutes, I'm preparing an issue
20181014 15:59:55<+wesdiscordbot> <Pentarctagon> same with scons and cmake as well, actually
20181014 16:00:10<+wesdiscordbot> <shadowm> Discord doesn't "shut down" when you close your browser
20181014 16:00:47<+wesdiscordbot> <shadowm> If you didn't claim a nick that nick will stay joined to a server forever unless you manually leave the server, assuming you didn't lose your session token
20181014 16:01:06<+wesdiscordbot> <shadowm> (Which you usually do when you haven't claimed a nick)
20181014 16:03:13<+wesdiscordbot> <josteph> So what's the correct way to close discord in-browser without creating ghosts ?
20181014 16:05:32<+wesdiscordbot> <Pentarctagon> once you've registered/claimed your nick, it should be fine.  I close out of discord by closing the tab/browser almost every day and there aren't a thousand Pentarctagons sitting around.
20181014 16:07:26<+wesdiscordbot> <josteph> I have registered, so those two you kicked must be old ghosts
20181014 16:07:42<+wesdiscordbot> <josteph> thanks everyone
20181014 16:07:57<+wesdiscordbot> <shadowm> Yeah, you have. People can't speak on this server anymore without properly registering.
20181014 16:17:10<+wesdiscordbot> <josteph> ok
20181014 16:23:53<+wesdiscordbot> <Nobun> @josteph even becouse it would be possible to access to #development also by accessing at irc.freenode.net on channel #wesnoth-dev
20181014 16:24:16-!- Nobun [~user@51.179.110.13] has joined #wesnoth-dev
20181014 16:24:20<+wesdiscordbot> <jyrkive> That doesn't do anything for Discord accounts.
20181014 16:24:37<+wesdiscordbot> <jyrkive> All IRC messages come from the @IRC account.
20181014 16:25:19<+wesdiscordbot> <Nobun> yeah I know. I mean that people could join #development even without registering at Discord so closing Discord to registered-only people is highly reasonable
20181014 16:25:31< Nobun> I am both in irc and discord :P
20181014 16:25:46<+wesdiscordbot> <Pentarctagon> the whole server requires registration now though.
20181014 16:26:12<+wesdiscordbot> <jyrkive> Mind you, all three channels have their IRC counterparts.
20181014 16:26:38<+wesdiscordbot> <shadowm> The IRC channels require registration too now
20181014 16:26:42<+wesdiscordbot> <Nobun> yeah. Even if I have to admit I don't know where #modding is on irc
20181014 16:26:49<+wesdiscordbot> <shadowm> #wesnoth-umc-dev
20181014 16:27:02<+wesdiscordbot> <shadowm> It's explained in #welcome actually
20181014 16:27:12<+wesdiscordbot> <jyrkive> Well, it's technically Freenode itself that requires registration, not us.
20181014 16:27:15<+wesdiscordbot> <josteph> @Pentarctagon regarding the pull request you asked about ^
20181014 16:27:22<+wesdiscordbot> <shadowm> No, freenode does not require registration
20181014 16:27:43<+wesdiscordbot> <shadowm> I am the one who set our IRC channels to require registration
20181014 16:27:45<+wesdiscordbot> <jyrkive> "[17:33:32] -freenode-connect- Due to the persistent ongoing spam, all new connections are being set +R (block messages from unidentified users) and will be scanned for vulnerabilities. This will not harm your computer, and vulnerable hosts will be notified."
20181014 16:27:46<+wesdiscordbot> <Nobun> @shadowm didn't notice that irc channel thank. However I didn't notice the registration irc requirement since I am registered in irc by years 😛
20181014 16:27:59<+wesdiscordbot> <shadowm> That does not do what you think it does
20181014 16:28:03<+wesdiscordbot> <josteph> What @jyrkive quoted affects PMs only
20181014 16:28:05<+wesdiscordbot> <josteph> IRC PMs
20181014 16:28:10<+wesdiscordbot> <shadowm> Yep
20181014 16:28:19<+wesdiscordbot> <josteph> the channels are probably mode +q $~a or something like that
20181014 16:28:25<+wesdiscordbot> <shadowm> Channel mode +r
20181014 16:29:00<+wesdiscordbot> <shadowm> Unauthenticated users simply cannot join channels that have mode +r set
20181014 16:29:17<+wesdiscordbot> <josteph> yep
20181014 16:30:02-!- josteph [~josteph@wesnoth/developer/josteph] has joined #wesnoth-dev
20181014 16:30:22<+wesdiscordbot> <Nobun> @shadowm thank. I knew /mode +m on a channel but I didn't knew /mode +r 😃
20181014 16:30:48<+wesdiscordbot> <shadowm> Everything that involves authentication with services is non-standard since it was never part of the original IRC RFCs.
20181014 16:30:50< celticminstrel> I think it's a non-standard mode.
20181014 16:30:57< josteph> celticminstrel, do you want to go through the list of 174 on https://github.com/wesnoth/wesnoth/issues/3614 and mark those that shouldn't be included? such as schema 
20181014 16:30:58<+wesdiscordbot> <shadowm> (and neither are services)
20181014 16:30:59< celticminstrel> shadowm beat me to it.
20181014 16:33:12<+wesdiscordbot> <shadowm> Anyway the reason I set +r was that I thought it was more confusing for people to be able to join but not speak
20181014 16:33:23<+wesdiscordbot> <shadowm> I think not all clients send the numeric response to that to the right place either
20181014 16:34:19<+wesdiscordbot> <shadowm> Whereas if they can't join the channel at all it's too obvious they did something wrong and there's a greater chance that they'll be looking at the server status window/tab/whatever where they'll receive the unregistered join numeric
20181014 16:37:17< irker379> wesnoth: josteph wesnoth:development 6cf9d04de5a4 / / (6 files in 2 dirs): Update branch name: master -> development https://github.com/wesnoth/wesnoth/commit/6cf9d04de5a41dd49731103b8ad6bf55c2ee6dbf
20181014 16:38:07< josteph> shadowm, makes sense. People who can't speak might not read topic (they should, but..)
20181014 16:38:50< celticminstrel> josteph: Should I add ticks to commits that I think should be included, or to commits I think should be excluded?
20181014 16:39:15< celticminstrel> ...though I guess I can't add ticks on this computer. I'll need to switch to Windows.
20181014 16:39:54< josteph> celticminstrel, Right now it's set so everything is ticked that I think should be included
20181014 16:40:10< celticminstrel> I don't even see the schema commits in the list...
20181014 16:40:12< josteph> Err, not quote
20181014 16:40:15< josteph> quite
20181014 16:40:21< josteph> I ticked everything that's "handled" 
20181014 16:40:30< celticminstrel> Oh wait, they're probably in the "merged cleanly" section.
20181014 16:40:36< josteph> either because it's already been cherry-picked (451), or because it'll be in the PR proposed (174)
20181014 16:40:42< josteph> yes they're there
20181014 16:40:57<+wesdiscordbot> <Pentarctagon> Also, regarding travis, I am looking into getting that fixed.  It looks like sdl-ttf just needs to be re-added to the docker image, but it's been a while since I've done anything with docker, so I need to get that set back up.
20181014 16:41:04< celticminstrel> Okay, so starting at 41fe473
20181014 16:41:31< celticminstrel> And it looks like the last one is 0119413, but it might be a bit earlier...
20181014 16:41:52< celticminstrel> Okay yeah, 0119413 is a mattsc commit so it's not related to schema...
20181014 16:42:09< celticminstrel> The last one is ad7b0ef.
20181014 16:42:11<+wesdiscordbot> <jyrkive> Can you put this to the GitHub issue instead of this chat?
20181014 16:42:16< celticminstrel> Yeah.
20181014 16:42:50< celticminstrel> Ah, there's a second sequence too... right, because I separated the fixes from the cleanups.
20181014 16:43:36< celticminstrel> 436d99e to fa14c65
20181014 16:45:01< celticminstrel> These two sequences of commits were cherry-picked from schema which is not yet merged; though it will eventually be merged, so if you think it would be simpler I can identify just those commits that do not have an equivalent in schema, which I think is only one or two.
20181014 16:46:42<+wesdiscordbot> <josteph> travis is failing on master
20181014 16:46:49-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection]
20181014 16:46:56<+wesdiscordbot> <josteph> looks like someone needs to push a docker image for development
20181014 16:47:52<+wesdiscordbot> <josteph> @jyrkive Thanks for the review of the teleport PR. That temporary set was indeed one of the things I didn't like about it.
20181014 16:48:09-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20181014 16:48:30-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection]
20181014 16:48:59-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20181014 16:53:48<+wesdiscordbot> <Pentarctagon> @josteph see my above comment
20181014 16:54:20<+wesdiscordbot> <Pentarctagon> though now it's failing because the BRANCH variable on travis was changed without a matching docker image being there
20181014 16:54:51<+wesdiscordbot> <josteph> right
20181014 17:09:02-!- josteph [~josteph@wesnoth/developer/josteph] has left #wesnoth-dev []
20181014 17:09:04-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Quit: Caught sigterm, terminating...]
20181014 17:10:41-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev
20181014 17:11:55<+wesdiscordbot> <Pentarctagon> hm
20181014 17:12:27<+wesdiscordbot> <Pentarctagon> got past the ttf error locally, but building with strict fails with: src/scripting/lua_common.cpp:306:0: error: ignoring #pragma warning  [-Werror=unknown-pragmas]  #pragma warning(push)   src/scripting/lua_common.cpp:307:0: error: ignoring #pragma warning  [-Werror=unknown-pragmas]  #pragma warning(disable: 4189)   src/scripting/lua_common.cpp:312:0: error: ignoring #pragma warning  [-Werror=unknown-pragmas] 
20181014 17:12:28<+wesdiscordbot> #pragma warning(pop)
20181014 17:13:07<+wesdiscordbot> <josteph> #pragma gcc warning(push)
20181014 17:13:22<+wesdiscordbot> <jyrkive> Thay are Visual Studio specific #pragmas. They should be wrapped in #ifdef _MSC_VER.
20181014 17:13:31<+wesdiscordbot> <jyrkive> @josteph 's advice is incorrect.
20181014 17:13:57-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Client Quit]
20181014 17:14:32<+wesdiscordbot> <josteph> yeah, that's not the gcc syntax, sorry
20181014 17:14:44<+wesdiscordbot> <josteph> but aren't pragmas supposed to be of the form  #pragma vendorname foo bar baz ?
20181014 17:16:27<+wesdiscordbot> <shadowm> Not really
20181014 17:17:15<+wesdiscordbot> <shadowm> Their interpretation is vendor-specific but the standard requires nothing specific about their syntax
20181014 17:17:40<+wesdiscordbot> <shadowm> e.g. a lot of compilers implement #pragma once with identical semantics
20181014 17:18:03<+wesdiscordbot> <jyrkive> https://feross.org/gcc-ownage/?1?1
20181014 17:18:31<+wesdiscordbot> <jyrkive> Even that implementation was compliant with the C++ standard.
20181014 17:20:30<+wesdiscordbot> <Nobun> As far as I know "#pragma once" is probably the only #pragma instruction that could be considered 'universal' thorugh compilers.
20181014 17:20:54<+wesdiscordbot> <shadowm> Yeah but that was a de facto thing.
20181014 17:21:11<+wesdiscordbot> <shadowm> C++98 didn't specify its existence, and neither does C++11 as far as I remember
20181014 17:21:18<+wesdiscordbot> <shadowm> (No idea about subsequent standards)
20181014 17:21:41<+wesdiscordbot> <shadowm> The only thing that they did specify was that #pragma directives are implementation-specific
20181014 17:21:53<+wesdiscordbot> <Nobun> I am an old-way man 😛 I still continue to use #ifndef, #define #endif and not #pragma once
20181014 17:22:29<+wesdiscordbot> <shadowm> People here switched to #pragma once as soon as I stopped having a say on that lol
20181014 17:22:38<+wesdiscordbot> <Nobun> however #pragma, as far as I know, should be considered like 'compiler directives' and not 'c/c++ language directives'
20181014 17:22:39<+wesdiscordbot> <josteph> https://en.cppreference.com/w/cpp/preprocessor/impl has #pragma STDC foo
20181014 17:22:52<+wesdiscordbot> <josteph> but I do stand corrected
20181014 17:23:16<+wesdiscordbot> <Nobun> since their meaning can change a lot through compilers
20181014 17:23:16<+wesdiscordbot> <jyrkive> @shadowm It was Vultraz's decision. And I don't really have any objections with it, as long as the codebase is consistent.
20181014 17:23:35<+wesdiscordbot> <shadowm> Yeah I personally don't think it was a bad choice
20181014 17:24:00<+wesdiscordbot> <shadowm> I do prefer typing a single line to the whole #ifndef boilerplate
20181014 17:24:27<+wesdiscordbot> <Nobun> #pragma once is acceptable becouse it is quite universal, indeed. But other #pragma directives are not trustable as 'portable through compilers' as far as I know
20181014 17:25:40<+wesdiscordbot> <Nobun> @shadowm yeah. What I mean is that in my application(s) I am too used to use #ifndef stuff so I end to always use #ifndef staff and not #pragma once 😛
20181014 17:26:26< irker379> wesnoth/wesnoth:development newfrenchy83 1cb0d4b91f Update abilities.cfg AppVeyor: vs2015/Release Failed
20181014 17:26:27< irker379> Details: https://ci.appveyor.com/project/wesnoth/wesnoth-7lnpw/builds/19498449
20181014 17:28:42<+wesdiscordbot> <Pentarctagon> @hrubymar10 or @sinda - looks like the xcode project will need to be updated as well: https://travis-ci.org/wesnoth/wesnoth/jobs/441325265#L1832
20181014 17:29:50-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev
20181014 17:29:51-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Client Quit]
20181014 17:30:20<+wesdiscordbot> <josteph> I'd have liked to do that before the merge to keep the history clean... 🤷
20181014 17:30:33< celticminstrel> I think I was the one to recomend pragma once actually.
20181014 17:30:36< celticminstrel> ^recommend
20181014 17:31:03-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev
20181014 17:33:24-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!]
20181014 17:33:35-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20181014 17:40:29-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Quit: Caught sigterm, terminating...]
20181014 17:40:30<+wesdiscordbot> <shadowm> I thought it was either iceiceice or vultraz tbh
20181014 17:41:00-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev
20181014 17:42:47<+wesdiscordbot> <josteph> My clone won't do automatic git gc until I do a manual git prune, now... as a result of that rebase, I'm sure.
20181014 17:43:04< irker379> wesnoth: josteph wesnoth:1.14 2d34a752c246 / src/units/udisplay.cpp: Unit Display: When a unit teleports, don't scroll to the source or destination h https://github.com/wesnoth/wesnoth/commit/2d34a752c246c466c12ab544f61182004c4a2570
20181014 17:43:06< irker379> wesnoth: josteph wesnoth:1.14 52343554acbf / src/units/ (udisplay.cpp unit.cpp unit.hpp): Units: Add is_visible_to_team() overload and use it to improve the previous comm https://github.com/wesnoth/wesnoth/commit/52343554acbf4f1bb76cf0c8f5bbd1c2a9975808
20181014 17:43:08< irker379> wesnoth: josteph wesnoth:1.14 c3da7b85103b / src/units/ (udisplay.cpp unit.cpp unit.hpp): Merge remote-tracking branch 'jostephd/invisible-teleport' into 1.14 https://github.com/wesnoth/wesnoth/commit/c3da7b85103ba1745c6f7811ecd295b7c268e64b
20181014 17:44:13-!- Ivanovic_ [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev
20181014 17:45:57-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Ping timeout: 252 seconds]
20181014 17:45:58< irker379> wesnoth/wesnoth:development josteph 6cf9d04de5 Update branch name: master -> developmen AppVeyor: vs2017/Release Failed
20181014 17:45:59< irker379> Details: https://ci.appveyor.com/project/wesnoth/wesnoth-605wt/builds/19498834
20181014 17:47:30-!- Ivanovic_ [~ivanovic@wesnoth/developer/ivanovic] has quit [Client Quit]
20181014 17:47:38<+wesdiscordbot> <Pentarctagon> getting this now with strict disabled: https://pastebin.com/5SPfrdAQ
20181014 17:48:01<+wesdiscordbot> <Pentarctagon> the image itself seems to be fine though, so I'm pushing those out to docker now.
20181014 17:49:01-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev
20181014 17:54:58-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection]
20181014 17:56:01-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20181014 17:56:42<+wesdiscordbot> <Pentarctagon> alright, updated docker images are pushed and I started a fresh travis build against development
20181014 17:56:52<+wesdiscordbot> <Pentarctagon> though travis is apparently swamped right now
20181014 17:57:36<+wesdiscordbot> <Pentarctagon> the build from josteph's commits above hasn't even started yet
20181014 18:00:08< irker379> wesnoth: josteph wesnoth:development 180971da2bfa / src/units/udisplay.cpp: Unit Display: When a unit teleports, don't scroll to the source or destination h https://github.com/wesnoth/wesnoth/commit/180971da2bfa0ca9be30a1152e661ecbb3fd31e9
20181014 18:00:10< irker379> wesnoth: josteph wesnoth:development 0f129f2d1022 / src/units/ (udisplay.cpp unit.cpp unit.hpp): Units: Add is_visible_to_team() overload and use it to improve the previous comm https://github.com/wesnoth/wesnoth/commit/0f129f2d102205145b231dafde396f0e94ad8624
20181014 18:02:23<+wesdiscordbot> <josteph> it's started now https://travis-ci.org/wesnoth/wesnoth/builds/441342122
20181014 18:02:34-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Read error: No route to host]
20181014 18:03:56-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev
20181014 18:04:30<+wesdiscordbot> <Pentarctagon> canceled my build then, since the commits to development will trigger it anywya
20181014 18:05:41<+wesdiscordbot> <Pentarctagon> ooh, that's why
20181014 18:05:52<+wesdiscordbot> <Pentarctagon> it was still going through the travis build from your PR
20181014 18:09:56<+wesdiscordbot> <sinda> @Pentarctagon Sure. That's in what branch?
20181014 18:10:28<+wesdiscordbot> <Pentarctagon> development
20181014 18:10:38<+wesdiscordbot> <Pentarctagon> the replacement for the master branch, essentially
20181014 18:11:55<+wesdiscordbot> <shadowm> Okay, I need the tl;dr for devs and contributors first
20181014 18:12:10<+wesdiscordbot> <shadowm> Then I need the tl;dr for wesnoth.org staff in addition to that
20181014 18:12:56<+wesdiscordbot> <shadowm> (I have a feeling no-one involved in whatever was decided factored in the fact that several server-side things rely on master being master.)
20181014 18:13:42<+wesdiscordbot> <shadowm> Also note that the average contributor cannot see the thread
20181014 18:16:23<+wesdiscordbot> <Pentarctagon> https://github.com/wesnoth/wesnoth/pull/3603 was merged in as development.  it's the replacement for the master branch, since master isn't currently functional.  right now it's mostly 1.13.12 + master's commits - the a_r commits that were breaking it, so it still needs any 1.14-only commits added such as sinda's iOS PR1.  so PRs should now go against development rather than master, and development has been set as the
20181014 18:16:23<+wesdiscordbot> repo's default branch.
20181014 18:17:15<+wesdiscordbot> <jyrkive> Not "merged in". I uploaded that branch without merging it into anything.
20181014 18:17:34<+wesdiscordbot> <shadowm> I know what he means
20181014 18:17:42<+wesdiscordbot> <shadowm> What are we wesnoth.org staff supposed to do now?
20181014 18:17:58<+wesdiscordbot> <shadowm> Should we have everything that wants master look at development instead?
20181014 18:18:14<+wesdiscordbot> <jyrkive> Yes.
20181014 18:18:16<+wesdiscordbot> <shadowm> (It's not as trivial as it sounds because there's a lot of stuff everywhere that specifically wants the name master.)
20181014 18:18:31<+wesdiscordbot> <Pentarctagon> maybe wait until https://github.com/wesnoth/wesnoth/issues/3614 is closed?
20181014 18:18:34<+wesdiscordbot> <shadowm> (This is why I'd have preferred a force push.)
20181014 18:19:38-!- Crab_ [1f0a9046@gateway/web/freenode/ip.31.10.144.70] has joined #wesnoth-dev
20181014 18:21:52<+wesdiscordbot> <shadowm> Okay, so you think we should wait?
20181014 18:22:23<+wesdiscordbot> <Pentarctagon> I would say wait until the first successful travis build, at least.
20181014 18:22:39<+wesdiscordbot> <shadowm> I'll be honest, I'd like to have Soliton and loonycyborg's help with this to make sure everything works right afterwards
20181014 18:22:51< celticminstrel> @Yumi - I'll see if I can think of a name, but no promises.
20181014 18:23:00<+wesdiscordbot> <Yumi> okay
20181014 18:23:07<+wesdiscordbot> <Yumi> I can't actually comment under your comment so I'll say it here
20181014 18:23:16<+wesdiscordbot> <shadowm> There are several scripts that expect the name 'trunk' instead and replace that with 'master' internally.
20181014 18:23:16<+wesdiscordbot> <Yumi> the magically imbued senses comes from the race description
20181014 18:23:28<+wesdiscordbot> <Yumi> if you think that I shouldn't keep that, then that's fine, but I would also suggest removing it from there too
20181014 18:23:33<+wesdiscordbot> <shadowm> I believe just making the master working tree on baldras actually point to development would be enough for those.
20181014 18:23:36< loonycyborg> maybe replace trunk with development now insetead :P
20181014 18:23:57< loonycyborg> but probably soliton should be asked about it
20181014 18:23:57<+wesdiscordbot> <shadowm> But there might be a few that expect 'master' and directly prod the Git repository instead of a working tree
20181014 18:24:04<+wesdiscordbot> <Pentarctagon> tbh I'm expecting all except translations to fail once travis gets around to it
20181014 18:24:25< celticminstrel> I see Jyrki reopened some fixed-on-AR issues.
20181014 18:25:02< celticminstrel> FTR, I went through all of them but didn't comment on those that had clearly been backported.
20181014 18:25:18<+wesdiscordbot> <shadowm> Also it might be a good idea to make the master branch disappear on the server so anything that looks at it directly instead of the working tree fails ASAP
20181014 18:25:31<+wesdiscordbot> <shadowm> (Instead of silently tracking an outdated branch forever.)
20181014 18:25:33< celticminstrel> On the server?
20181014 18:25:38< celticminstrel> You mean on GitHub or something else?
20181014 18:25:39<+wesdiscordbot> <shadowm> On the server
20181014 18:25:45<+wesdiscordbot> <shadowm> On the only server we control
20181014 18:25:49< celticminstrel> Ah okay.
20181014 18:26:09<+wesdiscordbot> <shadowm> Actually I guess one idea would be to make master track origin/development instead
20181014 18:26:20<+wesdiscordbot> <jyrkive> sh git branch -D master
20181014 18:26:26<+wesdiscordbot> <shadowm> But then we're still stuck with the issue of scripts that might look at the repository on GitHub directly
20181014 18:26:30<+wesdiscordbot> <shadowm> No
20181014 18:26:53<+wesdiscordbot> <josteph> What do  these scripts do? The units.wesnoth.org etc?
20181014 18:27:09<+wesdiscordbot> <josteph> I suggested breaking the build on master but that wouldn't help with stuff that just looks in the data/ dir
20181014 18:27:22<+wesdiscordbot> <josteph> (adding #error to wesnoth.cpp)
20181014 18:30:44<+wesdiscordbot> <shadowm> On the Proxmox host: the shared Git working trees update script On 102 (website): the add-ons server web index, gettext.w.o gen, and devdocs.w.o gen On 104 (units.w.o gen infra): the Wesnoth client build and wmlunits run scripts On 110 (wesnothd): the wesnothd build and run scripts On 120 (campaignd): the campaignd build and run script
20181014 18:30:55<+wesdiscordbot> <shadowm> If I'm not missing anything
20181014 18:31:17<+wesdiscordbot> <shadowm> It's been approximately 6-7 years since mass changes were needed to any of this stuff
20181014 18:31:53<+wesdiscordbot> <shadowm> Once for the SVN → Git migration, and again throughout Q3/Q4 2013 for the wesnoth.org host migration
20181014 18:32:29<+wesdiscordbot> <shadowm> There's also jenkins stuff that's loonycyborg's exclusive responsibility I believe
20181014 18:33:17< loonycyborg> yes
20181014 18:33:22< loonycyborg> but the chances are
20181014 18:33:43<+wesdiscordbot> <shadowm> The scripts on 110 and 120 only look at the working tree so making master track origin/development ought to suffice.
20181014 18:33:44< loonycyborg> iit will be mostly about rewiritng paths properly
20181014 18:33:52<+wesdiscordbot> <shadowm> I ignore what goes on in 104 for the most part.
20181014 18:34:04<+wesdiscordbot> <shadowm> 102 is a mixed bag IIRC.
20181014 18:35:18<+wesdiscordbot> <shadowm> On 102 gettext.wesnoth.org's infrastructure very explicitly references the master branch of wesnoth/wesnoth on GitHub for the purpose of generating link URLs in the front-end.
20181014 18:36:11<+wesdiscordbot> <shadowm> It also looks at the master working tree so what I said about 110 and 120 applies to it as well.
20181014 18:36:41<+wesdiscordbot> <shadowm> I could add a hack to make the frontend generate links pointing to development on GH and thus help me feel even more dead inside than I was after refactoring the whole mess last year.
20181014 18:39:21<+wesdiscordbot> <shadowm> devdocs.w.o is trivial and only looks at the working tree for master
20181014 18:40:21<+wesdiscordbot> <shadowm> https://cdn.discordapp.com/attachments/259976436490829825/501101973228224533/unknown.png
20181014 18:40:30<+wesdiscordbot> <shadowm> The addons.w.o web index gen is... trivial I guess.
20181014 18:42:05<+wesdiscordbot> <shadowm> So yeah I believe tracking origin/development as master is the easiest solution and only gettext.wesnoth.org's infrastructure would need an ugly hack to produce the correct links for users.
20181014 18:42:48<+wesdiscordbot> <shadowm> I really wish people had accepted my proposal to copy master and force-push the new tip as master instead though??
20181014 18:43:33<+wesdiscordbot> <Pentarctagon> celticminstrel did make https://github.com/wesnoth/wesnoth/tree/accelerated-rendering-attempt
20181014 18:43:48<+wesdiscordbot> <jyrkive> Vultraz opposed it, and I didn't want to push that point.
20181014 18:44:36<+wesdiscordbot> <shadowm> Well can I have a last conversation with @Vultraz about this before Soliton loonycyborg and I have to deal with any expected and unexpected consequences of tracking development instead of master?
20181014 18:44:57<+wesdiscordbot> <jyrkive> I don't have anything against that.
20181014 18:46:23<+wesdiscordbot> <shadowm> I also saw Gregory semi-opposing the idea and insisting on making the whole thing run through layers and layers of unneeded bureaucracy ("schedule", "inform people" etc.)
20181014 18:46:51-!- Crab_ [1f0a9046@gateway/web/freenode/ip.31.10.144.70] has quit [Ping timeout: 256 seconds]
20181014 18:47:14-!- Crab_ [1f0a9046@gateway/web/freenode/ip.31.10.144.70] has joined #wesnoth-dev
20181014 18:47:24<+wesdiscordbot> <shadowm> I think most contributors and devs can deal with a force-push relatively easily but making everyone stop looking at master is much harder than it sounds even if we factor wesnoth.org's infrastructure out of the equation
20181014 18:48:44<+wesdiscordbot> <shadowm> It'll basically be a source of confusion and constant questions for as long as it continues to exist as an offshoot branch instead of the/a primary development branch
20181014 18:49:50< Crab_> shadowm: re ' copy master and force-push the new tip as master' - just to provide an outside opinion (as I haven't touched Wesnoth for years...), that indeed sounds like the best solution, and I was wondering why you folks haven't went for it (and prohibit force pushes to it afterwards, at least for a while)
20181014 18:50:09<+wesdiscordbot> <shadowm> Oh hi Crab! Long time no see 😃
20181014 18:50:57< Crab_> shadowm: hi. indeed :)
20181014 18:55:10<+wesdiscordbot> <josteph> @shadowm Yes, by not force-pushing master we broke all existing clones, not just ones on wesnoth.org infra
20181014 18:55:51<+wesdiscordbot> <josteph> Agreed
20181014 18:57:45<+wesdiscordbot> <shadowm> Well a force-push is a breakage trigger as well, it's just more visible than just abandoning a branch entirely
20181014 18:58:39< celticminstrel> Yeah, there wasn't an option here to avoid breakage.
20181014 19:15:43-!- travis-ci [~travis-ci@ec2-54-211-33-91.compute-1.amazonaws.com] has joined #wesnoth-dev
20181014 19:15:44< travis-ci> wesnoth/wesnoth#19673 (development - 0f129f2 : josteph): The build failed.
20181014 19:15:44< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/441347416
20181014 19:15:44-!- travis-ci [~travis-ci@ec2-54-211-33-91.compute-1.amazonaws.com] has left #wesnoth-dev []
20181014 19:20:12< irker379> wesnoth: josteph wesnoth:development e77bb3451d59 / src/scripting/lua_common.cpp: Fix "unknown pragma" warnings on gcc. https://github.com/wesnoth/wesnoth/commit/e77bb3451d59afed5a34df9b9794c3b90a14e5fa
20181014 19:27:05-!- Crab_ [1f0a9046@gateway/web/freenode/ip.31.10.144.70] has quit [Ping timeout: 256 seconds]
20181014 19:29:29< irker379> wesnoth: josteph wesnoth:development 392d75c9a14a / projectfiles/VC14/ (wesnoth.vcxproj wesnoth.vcxproj.filters): Fix VC14 project files https://github.com/wesnoth/wesnoth/commit/392d75c9a14a76174a1a1655a04a228076d22121
20181014 20:06:24-!- Nobun [~user@51.179.110.13] has quit [Ping timeout: 272 seconds]
20181014 20:06:47-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev
20181014 20:30:59<+wesdiscordbot> <Pentarctagon> celticminstrel: ^
20181014 20:31:31< celticminstrel> ?
20181014 20:31:43< celticminstrel> Oh, that.
20181014 20:31:56< celticminstrel> I was worried for a moment wondering if we both simultaneously submitted the same issue.
20181014 20:32:03<+wesdiscordbot> <Pentarctagon> lol
20181014 20:32:15< celticminstrel> (I don't see issue notifications in this channel so you probably shouldn't point them out to me with arrows like that.)
20181014 20:32:25< celticminstrel> (I can see them, just not in this channel.)
20181014 20:32:41<+wesdiscordbot> <Pentarctagon> ah, okay
20181014 20:32:57< celticminstrel> I need to tag the issue I just submitted, because GitHub is still utterly broken on my Mac.
20181014 20:33:11< celticminstrel> Where by "broken" I mean "all the JavaScript does not function".
20181014 20:33:31< celticminstrel> Given what happened with Skype, I'm not expecting the situation to ever change, either.
20181014 20:34:10<+wesdiscordbot> <Pentarctagon> yeah, that... definitely sounds like a problem.
20181014 20:34:22< celticminstrel> It means I can't even view commits.
20181014 20:34:29< celticminstrel> Unless they're small ones.
20181014 20:35:13< irker379> wesnoth/wesnoth:development newfrenchy83 02d5a87d90 Update abilities.cpp AppVeyor: vs2015/Release Failed
20181014 20:35:14< irker379> Details: https://ci.appveyor.com/project/wesnoth/wesnoth-7lnpw/builds/19500174
20181014 20:38:41< celticminstrel> FTR, all issues (with rare exceptions) should have both a purple tag and either "bug" or "enhancement".
20181014 20:40:54<+wesdiscordbot> <Pentarctagon> I wasn't sure which this would be, actually.  There might've been a reason they've been implemented like this for so long.
20181014 20:41:15< celticminstrel> Ah.
20181014 20:41:23< celticminstrel> I guess that's fair.
20181014 20:41:50< celticminstrel> Tags can always be changed, but I guess if you're not sure it's okay to let someone else do it.
20181014 20:42:24-!- travis-ci [~travis-ci@ec2-54-211-33-91.compute-1.amazonaws.com] has joined #wesnoth-dev
20181014 20:42:25< travis-ci> wesnoth/wesnoth#19681 (development - 392d75c : josteph): The build is still failing.
20181014 20:42:25< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/441373166
20181014 20:42:25-!- travis-ci [~travis-ci@ec2-54-211-33-91.compute-1.amazonaws.com] has left #wesnoth-dev []
20181014 20:43:31<+wesdiscordbot> <loonycyborg> development branch doesn't build for me with fuh enabled
20181014 20:44:08<+wesdiscordbot> <Pentarctagon> which is also why travis just failed too.
20181014 20:44:37<+wesdiscordbot> <Pentarctagon> maybe something was missed when it was cherry-picked over to the development branch?
20181014 20:44:52<+wesdiscordbot> <loonycyborg> src/server/forum_user_handler.hpp:88:8: error: 'time_t' in namespace 'std' does not name a type
20181014 20:45:01<+wesdiscordbot> <shadowm> Is 1.14 fine?
20181014 20:45:13<+wesdiscordbot> <Pentarctagon> yes
20181014 20:45:20<+wesdiscordbot> <Pentarctagon> https://travis-ci.org/wesnoth/wesnoth/builds/441343260
20181014 20:45:23< celticminstrel> My first reaction to that error would be "someone forgot an #include <ctime>"
20181014 20:45:27<+wesdiscordbot> <shadowm> It might be some commit affecting the includes yes
20181014 20:45:41<+wesdiscordbot> <loonycyborg> dev branch is supposed to target -std=c++14 right?
20181014 20:45:46< celticminstrel> Yes.
20181014 20:46:24<+wesdiscordbot> <Pentarctagon> with 1 job targeting c++17, since there's conditional compilation using features from that.
20181014 20:49:32-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 244 seconds]
20181014 20:51:14< irker379> wesnoth: loonycyborg wesnoth:development 60fd504caf46 / src/server/forum_user_handler.hpp: Add missing #include <ctime> https://github.com/wesnoth/wesnoth/commit/60fd504caf46bbb1648de369303b76225d805e5d
20181014 20:52:53<+wesdiscordbot> <loonycyborg> unit tests have a problem too
20181014 20:53:15<+wesdiscordbot> <loonycyborg> src/tests/gui/test_gui2.cpp: In constructor '{anonymous}::dialog_tester<gui2::dialogs::mp_lobby>::dialog_tester()': src/tests/gui/test_gui2.cpp:855:52: error: 'create' is not a member of 'wesnothd_connection'
20181014 21:04:49-!- travis-ci [~travis-ci@ec2-54-234-224-223.compute-1.amazonaws.com] has joined #wesnoth-dev
20181014 21:04:50< travis-ci> wesnoth/wesnoth#19682 (development - 60fd504 : loonycyborg): The build is still failing.
20181014 21:04:50< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/441395427
20181014 21:04:50-!- travis-ci [~travis-ci@ec2-54-234-224-223.compute-1.amazonaws.com] has left #wesnoth-dev []
20181014 21:16:01< irker379> wesnoth/wesnoth:development newfrenchy83 7224969f0b Update wesnoth.vcxproj AppVeyor: vs2015/Release Failed
20181014 21:16:02< irker379> Details: https://ci.appveyor.com/project/wesnoth/wesnoth-7lnpw/builds/19500309
20181014 21:29:42<+wesdiscordbot> <Vultraz> Sounds like one of my commits is missing. ISTR I removed that function
20181014 21:30:08< celticminstrel> Hm?
20181014 21:30:29< celticminstrel> Isn't removing the function what causes this test failure? Or do you mean you also fixed the tests?
20181014 21:50:03< irker379> wesnoth/wesnoth:1.14 newfrenchy83 a92619520a Add Boost.Spirit to Code::Blocks Boost b AppVeyor: All builds passed
20181014 22:12:15<+wesdiscordbot> <josteph> wml and C++ tests all passed on 3603 on my system
20181014 22:13:34<+wesdiscordbot> <Pentarctagon> did you have forum_user_handler enabled?
20181014 22:13:37<+wesdiscordbot> <Yumi> celmin: I don't really like threepronged parallel construction because it's used everywhere, and I feel somewhat excessively
20181014 22:13:55<+wesdiscordbot> <Yumi> either way, do you have a preference for either description?
20181014 22:13:58< celticminstrel> Some things are system-specific, such as which includes you'll need.
20181014 22:14:04<+wesdiscordbot> <Pentarctagon> that seems to be what this is tripping up on
20181014 22:14:11< celticminstrel> @Yumi - No strong preference; I'd say I like both.
20181014 22:14:26<+wesdiscordbot> <Pentarctagon> (also why I enabled travis to build with that support)
20181014 22:14:42<+wesdiscordbot> <Yumi> okay
20181014 22:15:36< celticminstrel> What was the made-up word again, something like Väsjal?
20181014 22:15:56<+wesdiscordbot> <Yumi> I forgot
20181014 22:16:08<+wesdiscordbot> <Yumi> "Västaja"
20181014 22:16:11< celticminstrel> Ah.
20181014 22:16:54<+wesdiscordbot> <Yumi> maybe jyrkive or zookeeper can come up with something, they're finnish 🤔
20181014 22:17:07<+wesdiscordbot> <josteph> @Pentarctagon How would I tell? I build with scons wesnoth boost_unit_tests
20181014 22:17:18< celticminstrel> Okay, so based on the Elvish names for the old Markov generator, it doesn't seem like st or j are extant in Elvish.
20181014 22:17:31< celticminstrel> (Why is Finnish relevant?)
20181014 22:18:01<+wesdiscordbot> <Yumi> tolkien based a lot of his elvish languages on finnish
20181014 22:18:11<+wesdiscordbot> <Yumi> granted we obvs don't need to be a tolkien clone
20181014 22:18:25<+wesdiscordbot> <Pentarctagon> @josteph see https://github.com/wesnoth/wesnoth/blob/development/utils/travis/docker_run.sh#L78 specifically forum_user_handler=true
20181014 22:18:31< celticminstrel> Wesnoth's Elvish is clearly Tolkien-inspired though.
20181014 22:18:49<+wesdiscordbot> <Yumi> right, that's why I said that
20181014 22:19:11<+wesdiscordbot> <josteph> @Pentarctagon I don't pass that. I just pass cxx_std=14
20181014 22:19:14<+wesdiscordbot> <Yumi> hopefully you'll be able to come up with something, though :p
20181014 22:19:18<+wesdiscordbot> <Pentarctagon> which requires libmysqlclient-dev from https://github.com/wesnoth/wesnoth/blob/development/docker/Dockerfile-base-1804-development#L14
20181014 22:19:34<+wesdiscordbot> <josteph> I don't have that installed
20181014 22:19:45<+wesdiscordbot> <josteph> so no, I didn't build that. Didn't realize it was necessary for some tests
20181014 22:20:06<+wesdiscordbot> <josteph> didn't travis build 3603 back when it was just a PR? or did it skip because the PR was "not mergeable" according to github
20181014 22:20:19< celticminstrel> I'm thinking from the point of view of minimal changes to what you came up with here, but maybe... something like "Vasial"? Or if the T seems too important to lose, maybe "Vasital" or even "Vathial"?
20181014 22:20:53<+wesdiscordbot> <Pentarctagon> I'm fairly sure it didn't try since it wasn't mergeable.
20181014 22:21:05<+wesdiscordbot> <josteph> 😦
20181014 22:21:48< celticminstrel> I feel like there should be a project to support alternate database engines... >_>
20181014 22:21:56<+wesdiscordbot> <Pentarctagon> but yeah, there's additional functionality behind that flag, and I enabled it at some point since it was enabled for 1.14 on the official MP server.
20181014 22:22:01< celticminstrel> Obviously not high priority since few people put up their own server, but...
20181014 22:22:07<+wesdiscordbot> <josteph> About elvish names, "Arkan-thoria" is in Elvish but elvish units don't usually have k in their names ?
20181014 22:22:37< celticminstrel> Hm?
20181014 22:22:50< celticminstrel> FTR, K does not exist at all in the Elvish names.
20181014 22:23:09<+wesdiscordbot> <Yumi> idk
20181014 22:24:31< celticminstrel> ?
20181014 22:25:13< celticminstrel> (Is Arkan-thoria from Tolkien or Wesnoth? It's been awhile since I read Tolkien.)
20181014 22:25:15<+wesdiscordbot> <Yumi> maybe
20181014 22:25:25<+wesdiscordbot> <Yumi> Vasial sounds okay to me
20181014 22:25:34<+wesdiscordbot> <Yumi> I had the va- prefix mean little
20181014 22:25:39<+wesdiscordbot> <Yumi> so the other part should be "hero" or something like that
20181014 22:25:51< celticminstrel> Hm, okay.
20181014 22:25:55< celticminstrel> Seems reasonable.
20181014 22:26:17< celticminstrel> As far as I can see, the only consonant cluster Elvish uses is nd...
20181014 22:26:26< irker379> wesnoth/wesnoth:development newfrenchy83 1cb0d4b91f Update abilities.cfg AppVeyor: 2/4 builds failed
20181014 22:26:27< celticminstrel> As well as X+r.
20181014 22:26:27< irker379> Details vs2015/Release: https://ci.appveyor.com/project/wesnoth/wesnoth-7lnpw/builds/19498449
20181014 22:26:28< irker379> Details vs2017/Release: https://ci.appveyor.com/project/wesnoth/wesnoth-605wt/builds/19498450
20181014 22:26:34< celticminstrel> For various X
20181014 22:27:02< celticminstrel> Oh, there's a cl too... so maybe X+l is also allowed for any X.
20181014 22:27:20<+wesdiscordbot> <josteph> I think @Vultraz was right about a committing being missing from development: https://github.com/wesnoth/wesnoth/commit/7767902261e60f64a541cac11d647b0075ea1049
20181014 22:27:55<+wesdiscordbot> <josteph> acc3fe8 was picked but 7767902 was not
20181014 22:29:23< celticminstrel> Comparing the Elvish CFG with the Markov chain inputs, the former seems a little lacking actually...
20181014 22:30:32< celticminstrel> For example, I don't see any way for the CFG to produce a name ending in -clya.
20181014 22:30:53< celticminstrel> Of which there are several in the Markov chain inputs.
20181014 22:32:24<+wesdiscordbot> <josteph> ^ if travis passes please merge
20181014 22:32:27-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection]
20181014 22:34:58-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20181014 22:36:48<+wesdiscordbot> <Pentarctagon> @josteph https://travis-ci.org/wesnoth/wesnoth/jobs/441419283#L592 src/tests/gui/test_gui2.cpp:855:45: error: no match for 'operator*' (operand type is 'wesnothd_connection')   dialog_tester() : connection("", ""), init(*connection), li(installed_addons)
20181014 22:37:27<+wesdiscordbot> <Yumi> celmin: I'll change it to vathial, does that sound okay to you?
20181014 22:37:46<+wesdiscordbot> <Yumi> the a with the umlaut
20181014 22:38:04< celticminstrel> I think I'd prefer to see an á rather than an ä though.
20181014 22:38:13-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection]
20181014 22:38:50-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20181014 22:39:15<+wesdiscordbot> <Yumi> that's fine too
20181014 22:39:25<+wesdiscordbot> <Yumi> Váthial
20181014 22:39:52<+wesdiscordbot> <josteph> @Pentarctagon Thanks. I don't immediately see the problem.
20181014 22:40:01-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Client Quit]
20181014 22:40:03< celticminstrel> Because the only places I can find umlauts in the names is "eä" and final ë.
20181014 22:40:34-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20181014 22:41:15<+wesdiscordbot> <josteph> Ah I see
20181014 22:41:23<+wesdiscordbot> <josteph> There was a fixup ot the fixup
20181014 22:42:23<+wesdiscordbot> <josteph> Pushed another commit
20181014 22:43:42-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection]
20181014 22:45:58< irker379> wesnoth/wesnoth:development josteph 6cf9d04de5 Update branch name: master -> developmen AppVeyor: 2/4 builds failed
20181014 22:45:59< irker379> Details vs2017/Release: https://ci.appveyor.com/project/wesnoth/wesnoth-605wt/builds/19498834
20181014 22:46:00< irker379> Details vs2015/Release: https://ci.appveyor.com/project/wesnoth/wesnoth-7lnpw/builds/19498835
20181014 22:46:33<+wesdiscordbot> <josteph> celticminstrel, Arkan-thoria is the Longlier, the river in the Heart Mountains in HttT
20181014 22:50:24-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection]
20181014 22:50:41<+wesdiscordbot> <josteph> 3618 is an improvement, one of the travis builds passes the point it failed at before, but one of the other builds died
20181014 22:50:49<+wesdiscordbot> <josteph> /usr/bin/ld: libwesnoth-client.a(loading_screen.cpp.o): undefined reference to symbol '_ZTVN5boost6detail16thread_data_baseE' //usr/lib/x86_64-linux-gnu/libboost_thread.so.1.58.0: error adding symbols: DSO missing from command line
20181014 22:51:40<+wesdiscordbot> <josteph> @Pentarctagon ^. I'm afk
20181014 22:51:48<+wesdiscordbot> <Pentarctagon> hm
20181014 22:51:57-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20181014 22:59:36<+wesdiscordbot> <Vultraz> after speaking with shadowm I've decided it's best that we force-push to master after all
20181014 22:59:41<+wesdiscordbot> <Vultraz> I hadn't considered the breakage of scripts
20181014 23:00:33< celticminstrel> @Vultraz - Well, you can go ahead and do it then, right?
20181014 23:04:32<+wesdiscordbot> <Vultraz> pushed the current state of master to a new branch
20181014 23:06:17< celticminstrel> Wait, are you saying you did the same thing I did a few weeks ago?
20181014 23:06:59< celticminstrel> I mean this: https://github.com/wesnoth/wesnoth/commits/accelerated-rendering-attempt
20181014 23:08:02< irker379> wesnoth/wesnoth:development loonycyborg 60fd504caf Add missing #include <ctime> AppVeyor: vs2015/Release Failed
20181014 23:08:03< irker379> Details: https://ci.appveyor.com/project/wesnoth/wesnoth-7lnpw/builds/19502120
20181014 23:09:25<+wesdiscordbot> <Vultraz> name not descriptive enough
20181014 23:09:37< celticminstrel> ...
20181014 23:09:43< celticminstrel> Was too.
20181014 23:09:58< celticminstrel> It was way more descriptive than yours.
20181014 23:11:23<+wesdiscordbot> <Vultraz> well yours made it sound like it was only a_r stuff
20181014 23:11:50< celticminstrel> It's true it's not only a_r stuff, but that's still what distinguishes it from new master.
20181014 23:12:34<+wesdiscordbot> <shadowm> Now someone needs to force-push development into master, right?
20181014 23:14:09<+wesdiscordbot> <shadowm> Since otherwise this is the current state of things: 20:12:09 shadowm@hanacore ~/src/wesnoth git:master % git describe origin/development 1.13.12-1535-g60fd504caf4 20:12:52 shadowm@hanacore ~/src/wesnoth git:master % git describe origin/master 1.13.12-1912-g71a6daf961d 20:12:55 shadowm@hanacore ~/src/wesnoth git:master % git describe origin/old_master_20181015 1.13.12-1912-g71a6daf961d
20181014 23:14:57<+wesdiscordbot> <shadowm> And also set the default branch to master again after that.
20181014 23:14:58<+wesdiscordbot> <Vultraz> I've removed branch protection from master
20181014 23:15:28<+wesdiscordbot> <shadowm> Does that mean you'll be doing it?
20181014 23:16:00<+wesdiscordbot> <Vultraz> it's simple, hope I don't fuck it up...
20181014 23:16:22<+wesdiscordbot> <shadowm> git checkout master && git reset --hard origin/development
20181014 23:16:27<+wesdiscordbot> <shadowm> Is how I'd do it
20181014 23:17:00<+wesdiscordbot> <Vultraz> ....huh. I was gonna checkout development and push with --force to master
20181014 23:17:17<+wesdiscordbot> <shadowm> I don't think that's a thing?
20181014 23:17:32<+wesdiscordbot> <shadowm> You push refs into a repository not into refs
20181014 23:17:33<+wesdiscordbot> <shadowm> I think
20181014 23:17:53<+wesdiscordbot> <shadowm> Oh there's a way to do it with push it seems
20181014 23:18:20<+wesdiscordbot> <Vultraz> what's the correct way
20181014 23:18:30<+wesdiscordbot> <shadowm> This is Git, there are too many correct ways
20181014 23:18:48<+wesdiscordbot> <shadowm> I can just do it my way if you prefer then people can blame me instead
20181014 23:18:54<+wesdiscordbot> <Vultraz> sure
20181014 23:18:58< celticminstrel> You mean "git push origin source:dest"?
20181014 23:19:02<+wesdiscordbot> <shadowm> Okay
20181014 23:19:13<+wesdiscordbot> <Vultraz> what is elmin saying
20181014 23:19:18< celticminstrel> Though I think that requires the source to be a local branch.
20181014 23:19:45<+wesdiscordbot> <Vultraz> I'm not eminently familiar with the commands. I do everything in UI.
20181014 23:19:52< celticminstrel> So it'd be "git fetch development; git checkout -b development FETCH_HEAD; git push --force origin development:master".
20181014 23:19:57<+wesdiscordbot> <shadowm> I'm a strong independent woman who don't need no GUI
20181014 23:20:09< celticminstrel> Or if you have another way, go for it.
20181014 23:20:12<+wesdiscordbot> <shadowm> https://gist.github.com/shikadiqueen/cd26d4d717f29075ff36546808604220
20181014 23:20:23<+wesdiscordbot> <shadowm> It's done
20181014 23:20:42< celticminstrel> What Vultraz described is basically possible.
20181014 23:20:50<+wesdiscordbot> <shadowm> master and development now point to the same commit
20181014 23:21:03<+wesdiscordbot> <shadowm> So we can now delete development and set master back as the default
20181014 23:21:22<+wesdiscordbot> <Vultraz> readded branch protection
20181014 23:21:37<+wesdiscordbot> <Vultraz> master back to default
20181014 23:21:57<+wesdiscordbot> <Vultraz> damn you got there right before me
20181014 23:22:08<+wesdiscordbot> <shadowm> Apparently deleting development made GitHub do things
20181014 23:22:30<+wesdiscordbot> <Vultraz> alright, now we're all good?
20181014 23:22:32< celticminstrel> Things?
20181014 23:22:44<+wesdiscordbot> <shadowm> Yeah IRC scrubs don't get to see the notifications lolk
20181014 23:22:50<+wesdiscordbot> <shadowm> You'll find out soon
20181014 23:23:24<+wesdiscordbot> <Vultraz> agh, how do i fix my local branch
20181014 23:23:35<+wesdiscordbot> <shadowm> Which local branch?
20181014 23:23:39<+wesdiscordbot> <Vultraz> master
20181014 23:23:45<+wesdiscordbot> <shadowm> Did it have local changes?
20181014 23:23:48<+wesdiscordbot> <Vultraz> no
20181014 23:23:55<+wesdiscordbot> <shadowm> git reset --hard origin/master
20181014 23:24:04<+wesdiscordbot> <shadowm> Or whatever upstream it's supposed to be instead of origin.
20181014 23:24:21<+wesdiscordbot> <Vultraz> well that was easy
20181014 23:24:46< celticminstrel> Fixed. I'll let newfrenchy deal with his own PR though.
20181014 23:25:13< celticminstrel> I suppose reopening the previous iteration would be easiest, assuming that'll work.
20181014 23:25:27<+wesdiscordbot> <shadowm> I copied you
20181014 23:25:33<+wesdiscordbot> <shadowm> I changed the base branch and reopened it
20181014 23:25:35< celticminstrel> ?
20181014 23:25:39< celticminstrel> Oh.
20181014 23:25:46<+wesdiscordbot> <shadowm> That's what you did with the other two PRs isn't it?
20181014 23:25:54<+wesdiscordbot> <shadowm> I just made sure to leave a message stating so
20181014 23:25:55< celticminstrel> Yeah.
20181014 23:26:54<+wesdiscordbot> <shadowm> Soliton, loonycyborg: No need to do anything on the server side anymore, I'm taking care of pointing master downstream back to the new upstream tip
20181014 23:28:27<+wesdiscordbot> <shadowm> And done
20181014 23:47:40-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection]
20181014 23:48:04<+wesdiscordbot> <Pentarctagon> not sure what's going on with that linker error - it builds fine for me locally even if I use the same docker image as travis is.
--- Log closed Mon Oct 15 00:00:11 2018