--- Log opened Tue Nov 03 00:00:23 2015
20151103 00:00:51-!- ancestral [~ancestral@209.181.254.220] has quit [Quit: i go nstuf kthxbai]
20151103 00:05:34-!- Shackra [~Jorge@186.177.2.148] has quit [Ping timeout: 272 seconds]
20151103 00:33:42-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev
20151103 00:37:49-!- joet [~joet@host86-191-22-102.range86-191.btcentralplus.com] has left #wesnoth-dev ["Leaving"]
20151103 01:16:18-!- chris_ [~chris@ext-80.ias.edu] has quit [Ping timeout: 260 seconds]
20151103 01:29:36< neverEnough> curious, how much is traffic generated by server and addons?
20151103 01:30:24< neverEnough> (just a gross value is enough)
20151103 01:31:06< celticminstrel> ...does "gross value" even apply to this context?
20151103 01:31:29< iceiceice> neverEnough: its probably not much anymore
20151103 01:31:46< iceiceice> you can estimate how many people are on the multiplayer servers, there is a daily chart
20151103 01:31:48< iceiceice> somewhere
20151103 01:32:00< iceiceice> about a year ago it was like 100-200 at typical times
20151103 01:32:03< neverEnough> well, addon isn't related to this
20151103 01:32:05< iceiceice> now i guess its less than this
20151103 01:32:21< neverEnough> 100-200 what? in how long time?
20151103 01:32:24< iceiceice> neverEnough: i guess you could estimate by looking at total download numbers
20151103 01:32:29< iceiceice> on the 1.12 server
20151103 01:32:34< iceiceice> which has only been online for about a year
20151103 01:32:45< celticminstrel> Does it have upload numbers too?
20151103 01:33:06< iceiceice> yeah but upload is surely much less
20151103 01:33:11< iceiceice> http://status.wesnoth.org/
20151103 01:33:12< celticminstrel> Does it count downloads through the web interface?
20151103 01:33:20< iceiceice> no, but those are surely much less
20151103 01:34:40-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 246 seconds]
20151103 01:35:06< iceiceice> neverEnough: I guess i'm not really sure how much bandwidth a single connected person corresponds to typically
20151103 01:35:11< iceiceice> when they are on the mp serer
20151103 01:35:13< iceiceice> *server
20151103 01:36:06< iceiceice> if you want like, order of magnitude estimate...
20151103 01:36:26< iceiceice> i guess that, a wesnoth replay file basically corresponds to all of the bandwidth messages for the entire game
20151103 01:36:34< iceiceice> typical game is probably like an hour
20151103 01:36:57< iceiceice> replay file is like.... 10k? 100k?
20151103 01:37:01< iceiceice> i'm not really sure i guess
20151103 01:37:02< neverEnough> yy i know
20151103 01:37:04< iceiceice> it should be compressed
20151103 01:37:49< neverEnough> i just noticed (source: notsoeasycoding) that there is not any bandwidth+space saving system
20151103 01:37:58< neverEnough> the hashes proposal sounds interesting, dunno
20151103 01:38:23< celticminstrel> I do want to do something about the fact that 90% of the unit data is redundant.
20151103 01:38:36< celticminstrel> In saved games at least, but I think that could apply to MP too.
20151103 01:38:36< neverEnough> since it's hard task i'm not sure being able to complete, i was asking how needed is it
20151103 01:38:55< iceiceice> celticminstrel: it might not really be so redundant after gzip is run
20151103 01:39:08< iceiceice> gzip is pretty good at obvious repetition of a string
20151103 01:39:17< iceiceice> thats pretty much the only thing it is made to do
20151103 01:39:23< celticminstrel> That's not quite what I mean by redundant.
20151103 01:39:44< celticminstrel> It's redundant because it's repeating data that's defined in the [unit_type].
20151103 01:40:21< celticminstrel> Though I guess this would lead to lots of repeated strings.
20151103 01:40:34< celticminstrel> Or lots of duplicate lines.
20151103 01:40:43< celticminstrel> But, not consecutively or anything.
20151103 01:42:38< celticminstrel> Still, it's information that doesn't need to be stored at all.
20151103 01:43:35-!- wedge010 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev
20151103 01:46:21-!- louis94 [~~louis94@109.129.245.154] has quit [Quit: Konversation terminated!]
20151103 01:46:47-!- iceiceice_ [~chris@ext-74.ias.edu] has joined #wesnoth-dev
20151103 01:46:48-!- iceiceice_ [~chris@ext-74.ias.edu] has quit [Changing host]
20151103 01:46:48-!- iceiceice_ [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev
20151103 01:46:57-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Ping timeout: 265 seconds]
20151103 01:46:57-!- wedge010 is now known as wedge009
20151103 01:50:31-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Quit: Leaving]
20151103 01:57:46-!- Appleman1234 [~Appleman1@KD111239009219.au-net.ne.jp] has quit [Ping timeout: 246 seconds]
20151103 02:11:39-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has quit [Quit: tomreyn]
20151103 02:12:18-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!]
20151103 02:24:23< neverEnough> waiting for merge issues with my pull request ^^
20151103 02:46:02-!- rayblade53 [~chatzilla@124.109.10.167] has joined #wesnoth-dev
20151103 02:46:04-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has quit [Read error: Connection reset by peer]
20151103 02:46:22-!- rayblade53 is now known as vultraz
20151103 02:54:54< neverEnough> uhm that travis site is pretty slow, why don't u set up an hudson-like server ur own?
20151103 02:57:28-!- neverEnough [~nEnough@host46-160-dynamic.4-87-r.retail.telecomitalia.it] has quit [Quit: gn8 world]
20151103 03:10:13-!- Appleman1234 [~Appleman1@KD111239009219.au-net.ne.jp] has joined #wesnoth-dev
20151103 03:33:08-!- Portaljacker [~Portaljac@modemcable081.139-178-173.mc.videotron.ca] has joined #wesnoth-dev
20151103 03:35:55-!- Portaljacker [~Portaljac@modemcable081.139-178-173.mc.videotron.ca] has quit [Client Quit]
20151103 03:55:04-!- iceiceice_ [~chris@wesnoth/developer/iceiceice] has quit [Quit: Leaving]
20151103 04:23:26-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: So long and thanks for all the fish.]
20151103 04:25:40-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev
20151103 04:29:41-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Remote host closed the connection]
20151103 05:04:21-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has joined #wesnoth-dev
20151103 05:19:49-!- vincent_c [~bip@vcheng.org] has quit [Quit: Coyote finally caught me]
20151103 05:20:25-!- vincent_c [~bip@107.191.117.101] has joined #wesnoth-dev
20151103 05:40:06-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai]
20151103 05:53:09-!- iceiceice [~chris@ext-74.ias.edu] has joined #wesnoth-dev
20151103 05:53:09-!- iceiceice [~chris@ext-74.ias.edu] has quit [Changing host]
20151103 05:53:09-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev
20151103 05:55:57-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has joined #wesnoth-dev
20151103 06:26:43-!- Kwandulin [~Miranda@p200300760F18C02E21DE8250A02CCCFD.dip0.t-ipconnect.de] has joined #wesnoth-dev
20151103 06:43:20-!- celticminstrel [~celmin@unaffiliated/celticminstrel] has quit [Quit: And lo! The computer falls into a deep sleep, to awake again some other day!]
20151103 07:25:47-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai]
20151103 07:53:16-!- EdB [~edb@89-158-11-138.rev.numericable.fr] has joined #wesnoth-dev
20151103 07:54:36-!- horrowind1 [~Icedove@2a02:810a:8b00:1c54:21b:fcff:fee3:c3ff] has joined #wesnoth-dev
20151103 07:56:14-!- boucman_work [~jrosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20151103 08:01:19-!- oldlaptop [~quassel@192.183.50.87] has quit [Ping timeout: 240 seconds]
20151103 08:09:24-!- oldlaptop [~quassel@192.183.50.87] has joined #wesnoth-dev
20151103 09:13:47-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev
20151103 09:21:04-!- Kwandulin_2 [~Miranda@p200300760F18C02E3D84856FDD5E78A5.dip0.t-ipconnect.de] has joined #wesnoth-dev
20151103 09:21:54-!- Kwandulin [~Miranda@p200300760F18C02E21DE8250A02CCCFD.dip0.t-ipconnect.de] has quit [Ping timeout: 246 seconds]
20151103 09:25:01-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 252 seconds]
20151103 09:35:37< Soliton> we have jenkins: http://baldras.wesnoth.org:8080/
20151103 09:36:12-!- vultraz [~chatzilla@124.109.10.167] has quit [Ping timeout: 272 seconds]
20151103 09:40:03-!- horrowind1 [~Icedove@2a02:810a:8b00:1c54:21b:fcff:fee3:c3ff] has quit [Quit: horrowind1]
20151103 09:42:23-!- EdB [~edb@89-158-11-138.rev.numericable.fr] has quit [Quit: Konversation terminated!]
20151103 09:53:07-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-dev
20151103 09:55:36-!- joet [~joet@host86-191-22-102.range86-191.btcentralplus.com] has joined #wesnoth-dev
20151103 10:02:13-!- mjs-de [~mjs-de@x4db5bd78.dyn.telefonica.de] has joined #wesnoth-dev
20151103 10:26:24-!- joet_ [~joet@host86-191-22-51.range86-191.btcentralplus.com] has joined #wesnoth-dev
20151103 10:27:38-!- joet [~joet@host86-191-22-102.range86-191.btcentralplus.com] has quit [Ping timeout: 240 seconds]
20151103 10:43:53-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has joined #wesnoth-dev
20151103 11:13:02-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20151103 11:15:33-!- joet_ is now known as joet
20151103 12:11:06-!- Appleman1234 [~Appleman1@KD111239009219.au-net.ne.jp] has quit [Ping timeout: 240 seconds]
20151103 12:35:25-!- Ravana_ [~Ravana@unaffiliated/ravana/x-2327071] has quit [Remote host closed the connection]
20151103 12:35:26-!- quentinp [~quentin@ns363174.ip-91-121-196.eu] has quit [Ping timeout: 240 seconds]
20151103 12:36:22-!- quentinp [~quentin@ns363174.ip-91-121-196.eu] has joined #wesnoth-dev
20151103 12:36:45-!- Ravana_ [~Ravana@unaffiliated/ravana/x-2327071] has joined #wesnoth-dev
20151103 12:50:27-!- Kwandulin_2 [~Miranda@p200300760F18C02E3D84856FDD5E78A5.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer]
20151103 13:07:37-!- Appleman1234 [~Appleman1@KD106161094070.au-net.ne.jp] has joined #wesnoth-dev
20151103 13:31:13-!- Kwandulin [~Miranda@p200300760F18C02E71245A814C6A9619.dip0.t-ipconnect.de] has joined #wesnoth-dev
20151103 13:43:39-!- wedge010 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev
20151103 13:46:59-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Ping timeout: 264 seconds]
20151103 13:47:00-!- wedge010 is now known as wedge009
20151103 14:01:55-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has joined #wesnoth-dev
20151103 14:11:58-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai]
20151103 14:13:02-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev
20151103 14:30:19-!- Kwandulin [~Miranda@p200300760F18C02E71245A814C6A9619.dip0.t-ipconnect.de] has quit [Ping timeout: 240 seconds]
20151103 14:30:31-!- Kwandulin [~Miranda@p200300760F18C01B388FBDEFCE94F993.dip0.t-ipconnect.de] has joined #wesnoth-dev
20151103 14:40:28-!- markus__ [~mjs-de@x4db51cbd.dyn.telefonica.de] has joined #wesnoth-dev
20151103 14:44:38-!- mjs-de [~mjs-de@x4db5bd78.dyn.telefonica.de] has quit [Ping timeout: 272 seconds]
20151103 14:59:39-!- oldlaptop [~quassel@192.183.50.87] has quit [Ping timeout: 240 seconds]
20151103 15:23:19-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has joined #wesnoth-dev
20151103 15:26:00-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has quit [Client Quit]
20151103 15:37:51-!- oldlaptop [~quassel@192.183.50.87] has joined #wesnoth-dev
20151103 15:45:43-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: mattsc]
20151103 16:12:43-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev
20151103 16:22:59-!- boucman_work [~jrosen@wesnoth/developer/boucman] has quit [Ping timeout: 264 seconds]
20151103 16:29:03-!- celticminstrel [~celmin@unaffiliated/celticminstrel] has joined #wesnoth-dev
20151103 16:53:22-!- aeth [~Michael@wesnoth/umc-dev/developer/aethaeryn] has quit [Ping timeout: 260 seconds]
20151103 17:01:14-!- aeth [~Michael@wesnoth/umc-dev/developer/aethaeryn] has joined #wesnoth-dev
20151103 17:03:56-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has joined #wesnoth-dev
20151103 17:12:50-!- nurupo [~nurupo.ga@unaffiliated/nurupo] has quit [Ping timeout: 240 seconds]
20151103 17:18:16-!- nurupo [~nurupo.ga@unaffiliated/nurupo] has joined #wesnoth-dev
20151103 17:20:26-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: mattsc]
20151103 17:21:53-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20151103 17:22:00-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 250 seconds]
20151103 17:23:38-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai]
20151103 17:27:14-!- gfgtdf [~chatzilla@f054163071.adsl.alicedsl.de] has joined #wesnoth-dev
20151103 17:29:46-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has joined #wesnoth-dev
20151103 17:35:47-!- markus__ is now known as mjs-de
20151103 17:39:41-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai]
20151103 17:41:12-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has joined #wesnoth-dev
20151103 17:52:51-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai]
20151103 17:53:17-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has joined #wesnoth-dev
20151103 17:54:23-!- fendrin [~quassel@wesnoth/developer/fendrin] has joined #wesnoth-dev
20151103 17:58:34-!- fabi [~quassel@wesnoth/developer/fendrin] has quit [Ping timeout: 260 seconds]
20151103 17:58:47-!- ypnos [~ypnos@lme51.informatik.uni-erlangen.de] has quit [Remote host closed the connection]
20151103 18:04:20-!- Nobun [~nobun@62.19.29.247] has joined #wesnoth-dev
20151103 18:08:51-!- Nobun1 [~nobun@62.19.32.159] has joined #wesnoth-dev
20151103 18:09:21-!- Nobun1 is now known as Nobun_1
20151103 18:10:23-!- Nobun [~nobun@62.19.29.247] has quit [Ping timeout: 264 seconds]
20151103 18:20:01-!- gfgtdf [~chatzilla@f054163071.adsl.alicedsl.de] has quit [Quit: ChatZilla 0.9.92 [Firefox 41.0.2/20151014143721]]
20151103 18:27:55-!- janebot___ [~Gambot@grickit.us] has quit [Remote host closed the connection]
20151103 18:28:01-!- janebot___ [~Gambot@grickit.us] has joined #wesnoth-dev
20151103 18:28:06-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai]
20151103 18:28:37-!- Nobun_1 is now known as Nobun
20151103 18:34:29-!- fendrin [~quassel@wesnoth/developer/fendrin] has quit [Ping timeout: 268 seconds]
20151103 18:36:17-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev
20151103 18:42:35-!- janebot___ is now known as janebot
20151103 18:43:05-!- janebot is now known as Guest83424
20151103 18:43:26-!- Guest83424 [~Gambot@grickit.us] has quit [Remote host closed the connection]
20151103 18:43:42-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev
20151103 18:45:10-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has joined #wesnoth-dev
20151103 18:52:36-!- juman [~quassel@x5d869478.dyn.telefonica.de] has joined #wesnoth-dev
20151103 18:55:21-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!]
20151103 19:07:03-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai]
20151103 19:07:49-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Quit: wedge009]
20151103 19:08:09-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev
20151103 19:09:12-!- fabi [~quassel@wesnoth/developer/fendrin] has joined #wesnoth-dev
20151103 19:11:02-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has joined #wesnoth-dev
20151103 19:12:20-!- juman [~quassel@x5d869478.dyn.telefonica.de] has quit [Remote host closed the connection]
20151103 19:38:39-!- Nobun [~nobun@62.19.32.159] has quit [Ping timeout: 255 seconds]
20151103 20:06:59-!- Nobun [~nobun@62.19.29.6] has joined #wesnoth-dev
20151103 20:07:21-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20151103 20:09:00-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Client Quit]
20151103 20:19:15-!- horrowind1 [~Icedove@2a02:810a:8b00:1c54:21b:fcff:fee3:c3ff] has joined #wesnoth-dev
20151103 20:36:25-!- neverEnough [~nEnough@host46-160-dynamic.4-87-r.retail.telecomitalia.it] has joined #wesnoth-dev
20151103 20:46:12-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev
20151103 20:54:33< neverEnough> why did u feel the need to port bfw from sdl_net to asio?
20151103 20:56:26-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai]
20151103 20:56:35< neverEnough> (question related to "would be asio good to learn for my purposes?")
20151103 21:00:08< shadowm> SDL_net is only really intended as a technical demo AFAIK, and lacks various features we need (forcing us to engage in very shady coding practices sometimes).
20151103 21:00:32< shadowm> And most notably, it does not have IPv6 support at all.
20151103 21:03:15< neverEnough> "very shady coding", there is something important SDL_net did lack?
20151103 21:03:43< shadowm> Yeah, but I'm not sure of the specifics, only that src/network_worker.cpp violates protocol and assumes things about SDL_net's internal ABI as a result.
20151103 21:03:47-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has joined #wesnoth-dev
20151103 21:04:06< neverEnough> ABI = ?
20151103 21:04:29-!- Kwandulin [~Miranda@p200300760F18C01B388FBDEFCE94F993.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer]
20151103 21:04:33< shadowm> Application binary interface.
20151103 21:04:44< neverEnough> thanks :)
20151103 21:05:22< shadowm> For example the size and alignment of individual members of a structure.
20151103 21:06:22< shadowm> Though I say "internal ABI", it's not really an ABI at all, it's just an opaque structure declared by SDL_net which applications obviously shouldn't touch and is only defined and used by one private unit in SDL_net.
20151103 21:06:24-!- Nobun1 [~nobun@62.19.32.61] has joined #wesnoth-dev
20151103 21:06:24-!- Nobun1 is now known as Nobun_1
20151103 21:07:10< shadowm> It's like libc's FILE.
20151103 21:08:27< neverEnough> hm thanks
20151103 21:08:53-!- Nobun [~nobun@62.19.29.6] has quit [Ping timeout: 244 seconds]
20151103 21:09:23< neverEnough> about last commit, i hope the way i branched and pulled 2 different kind of patches will be correct for git history
20151103 21:09:39< neverEnough> in case, i'm here willig to reset
20151103 21:11:37< shadowm> Do we need to know https://github.com/niegenug/wesnoth/commit/5cc149f21fe577772167f014f836d67dee7afbe7 existed at some point?
20151103 21:14:54< neverEnough> yes it is the definitive change after 7bfd235
20151103 21:15:15< shadowm> But do we need to know it happened?
20151103 21:15:35< neverEnough> i firstly added the feature (7bfd235), then noticed i added a bug and fixed in 5cc149f
20151103 21:15:46< shadowm> But you did before publishing the PR.
20151103 21:15:53< neverEnough> a different feature is last one, f8b6000
20151103 21:16:07< neverEnough> no not needed
20151103 21:16:21< neverEnough> just the first commit includes 2 files change, while the fix is just on one
20151103 21:16:26< shadowm> That means that from our point of view it's as if the bug never existed in the first place since it never was in our repository.
20151103 21:16:37< neverEnough> exactly
20151103 21:16:53< celticminstrel> This is what git commit --amend is good for. :)
20151103 21:17:00< neverEnough> i added the bug (edited 2 files), fixed it (re-edited just 1)
20151103 21:17:07< neverEnough> ok
20151103 21:17:10< celticminstrel> Assuming the commits are consecutive.
20151103 21:17:11< shadowm> Generally, people working on private branches are expected to coalesce multiple-iteration patches like that before publishing unless they are certain that we need to know the details for some reason.
20151103 21:17:36< celticminstrel> If they're not consecutive then you'd need git rebase -i
20151103 21:17:46< neverEnough> k
20151103 21:17:50< shadowm> celticminstrel: The top commit is unrelated, so rebase is  needed.
20151103 21:18:07< celticminstrel> Likewise if you've already made additional commits afterwards.
20151103 21:19:19< neverEnough> so i proceed with revert?
20151103 21:19:30< celticminstrel> Not revert, rebase.
20151103 21:19:34< neverEnough> ok
20151103 21:19:43< shadowm> Are you using the command-line Git client?
20151103 21:22:29< neverEnough> yes
20151103 21:22:46< celticminstrel> git rebase -i
20151103 21:22:56< celticminstrel> That'll bring up an editor
20151103 21:23:00-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has quit [Ping timeout: 272 seconds]
20151103 21:23:24< celticminstrel> Oh right.
20151103 21:23:31< celticminstrel> You need to specify how much to rebase.
20151103 21:23:37< celticminstrel> git rebase -i HEAD~3 for example.
20151103 21:24:04< celticminstrel> That means you're editing the last three commits, I think.
20151103 21:24:05< neverEnough> 3 is the commits behind
20151103 21:24:19< celticminstrel> Then that's probably good?
20151103 21:25:26< neverEnough> editor says: noop
20151103 21:25:26< neverEnough> # Rebase f8b6000..8d22b2f onto f8b6000
20151103 21:25:37< neverEnough> this is still the same right
20151103 21:26:08< shadowm> You have more commits that you haven't pushed yet?
20151103 21:26:18< neverEnough> no
20151103 21:26:26< neverEnough> i just noticed i did it wrong, i named my branch
20151103 21:26:40< shadowm> Because f8b6000 is the tip of your published branch, so that range doesn't make sense.
20151103 21:26:40< neverEnough> without any branch, just the plain command get things better
20151103 21:26:54< neverEnough> pick 7bfd235 Added user's leave notification for ingame players
20151103 21:26:54< neverEnough> pick 5cc149f Fixed a logic issue in previous commit
20151103 21:26:54< neverEnough> pick f8b6000 Whisperers get cleaned when user disconnects
20151103 21:26:54< neverEnough> # Rebase 8d22b2f..f8b6000 onto 8d22b2f
20151103 21:27:10< shadowm> That sounds more like it.
20151103 21:27:26< celticminstrel> So the commits are consecutive?
20151103 21:27:29-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: So long and thanks for all the fish.]
20151103 21:27:30< neverEnough> yes
20151103 21:27:34< shadowm> You want to change "pick 5cc149f" to "f 5cc149f" and leave the rest alone.
20151103 21:27:39< celticminstrel> Yeah that.
20151103 21:27:58< celticminstrel> Just change "pick" to "f" on that line.
20151103 21:28:06< celticminstrel> Then save and exit.
20151103 21:28:12< neverEnough> ok, then ctrl+x?
20151103 21:28:28< celticminstrel> Huh?
20151103 21:28:30< neverEnough> wow this way of sending commands is tricky :D
20151103 21:28:36< shadowm> That sounds like nano.
20151103 21:28:45< celticminstrel> Oh, right.
20151103 21:28:56< neverEnough> [detached HEAD f9a4eb4] Added user's leave notification for ingame players
20151103 21:28:56< neverEnough>  2 files changed, 12 insertions(+), 2 deletions(-)
20151103 21:28:56< neverEnough> Successfully rebased and updated detached HEAD.
20151103 21:29:26< shadowm> Why is your HEAD detached? Did you use `git checkout` on a commit hash at some point?
20151103 21:29:48< celticminstrel> git status
20151103 21:30:16< neverEnough> git status
20151103 21:30:16< neverEnough> # Not currently on any branch.
20151103 21:30:16< neverEnough> nothing to commit (working directory clean)
20151103 21:30:25< celticminstrel> What's the name of your branch?
20151103 21:30:31< neverEnough>  git checkout trackleaves 
20151103 21:30:31< neverEnough> Warning: you are leaving 2 commits behind, not connected to
20151103 21:30:31< neverEnough> any of your branches:
20151103 21:30:31< neverEnough>   9ef31fb Whisperers get cleaned when user disconnects
20151103 21:30:31< neverEnough>   f9a4eb4 Added user's leave notification for ingame players
20151103 21:30:31< neverEnough> If you want to keep them by creating a new branch, this may be a good time
20151103 21:30:33< neverEnough> to do so with:
20151103 21:30:35< neverEnough>  git branch new_branch_name 9ef31fbeccafd4aac557d60aa657994420207b20
20151103 21:30:37< neverEnough> Switched to branch 'trackleaves'
20151103 21:30:42< celticminstrel> Wait.
20151103 21:30:44< neverEnough> ^^
20151103 21:30:56< celticminstrel> git status
20151103 21:31:05< celticminstrel> You're on branch trackleaves?
20151103 21:31:08< neverEnough> y
20151103 21:31:20< celticminstrel> git reset --hard 9ef31fb
20151103 21:31:25< celticminstrel> That should fix it.
20151103 21:31:27< shadowm> `git checkout trackleaves`, yes, now `git reset --hard f9a4eb4` (will revert your local changes) to force your branch to match what you just rebased.
20151103 21:31:38< celticminstrel> Or maybe shadowm's.
20151103 21:31:41< shadowm> Next time you should make sure you are on the correct branch before rebasing (or doing anything else, really).
20151103 21:31:45< celticminstrel> One of those will fix it.
20151103 21:32:02< shadowm> Actually, celticminstrel's is more correct.
20151103 21:32:07< celticminstrel> Verify afterwards with git log
20151103 21:32:10-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Quit: Leaving]
20151103 21:32:12< shadowm> I forgot that the display order goes from most recent to oldest.
20151103 21:32:27< neverEnough>  git reset --hard f9a4eb4
20151103 21:32:27< neverEnough> HEAD is now at f9a4eb4 Added user's leave notification for ingame players
20151103 21:32:37< shadowm> What I just said.
20151103 21:32:42< celticminstrel> And git log shows both the two commits now?
20151103 21:32:46-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20151103 21:33:18< neverEnough> uh no just one :(
20151103 21:33:23< shadowm> 18:31:22 <celticminstrel> git reset --hard 9ef31fb
20151103 21:33:31< shadowm> ^ Do this.
20151103 21:34:59< neverEnough>  git reset --hard 9ef31fb
20151103 21:34:59< neverEnough> HEAD is now at 9ef31fb Whisperers get cleaned when user disconnects
20151103 21:35:14< celticminstrel> And now git log shows both commits, right?
20151103 21:35:31< neverEnough> yes :)
20151103 21:35:37< shadowm> To clarify, what git reset does is set your branch's HEAD to point to the specified commit.
20151103 21:35:58< shadowm> The reason that setting it to f9a4eb4 made the second commit disappear is because f9a4eb4 is the parent of the second commit.
20151103 21:36:17< neverEnough> oh ok
20151103 21:36:31< neverEnough> but so the fix i did in the middle got lost?
20151103 21:36:40< celticminstrel> Not exactly.
20151103 21:37:02< shadowm> No, if you look at the diff of f9a4eb4 with `git show -p f9a4eb4`, you should see the fix applied to the original commit.
20151103 21:37:02< celticminstrel> It's now rolled into the first commit.
20151103 21:37:32< shadowm> As in the diff of f9a4eb4 is now the combination of both diffs.
20151103 21:39:56< neverEnough> oh nice, thanks
20151103 21:40:10-!- iceiceice [~chris@ext-74.ias.edu] has joined #wesnoth-dev
20151103 21:40:10-!- iceiceice [~chris@ext-74.ias.edu] has quit [Changing host]
20151103 21:40:10-!- iceiceice [~chris@wesnoth/developer/iceiceice] has joined #wesnoth-dev
20151103 21:40:12< neverEnough> i save this log for the next time
20151103 21:40:51< shadowm> Something that we don't enforce especially on old code (yet): formatting. New code should generally follow this style: http://pastebin.com/FAx96XpG
20151103 21:42:23< shadowm> In particular, you should always use braces with if/else (line 36) even if the body is a single statement, and the body always should begin on the next line an indentation level deeper than the opening keyword.
20151103 21:43:01< neverEnough> ok got it
20151103 21:43:42< celticminstrel> I assume you do understand where I got 9ef31fb from.
20151103 21:43:44< shadowm> Also, if your editor could automatically discard whitespace-only lines on save (but only newly introduced lines), that'd be great.
20151103 21:43:46< neverEnough> since writing my own involves to A LOT of errors, i tend to recover code from similar lines
20151103 21:44:28 * shadowm will be back later.
20151103 21:44:37< shadowm> (Much later, probably.)
20151103 21:45:34< neverEnough> bb
20151103 21:52:06-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai]
20151103 22:03:03-!- louis94 [~~louis94@109.129.245.154] has joined #wesnoth-dev
20151103 22:21:58-!- iceiceice [~chris@wesnoth/developer/iceiceice] has quit [Quit: Leaving]
20151103 22:29:42-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20151103 22:33:28-!- mjs-de [~mjs-de@x4db51cbd.dyn.telefonica.de] has quit [Remote host closed the connection]
20151103 22:46:37-!- ancestral [~ancestral@71-220-62-196.mpls.qwest.net] has joined #wesnoth-dev
20151103 22:54:55-!- EliDupree [~quassel@idupree.com] has quit [Remote host closed the connection]
20151103 22:55:07-!- EliDupree [~quassel@idupree.com] has joined #wesnoth-dev
20151103 22:56:12-!- EliDupree [~quassel@idupree.com] has quit [Remote host closed the connection]
20151103 22:56:32-!- EliDupree [~quassel@idupree.com] has joined #wesnoth-dev
20151103 22:57:07-!- horrowind1 [~Icedove@2a02:810a:8b00:1c54:21b:fcff:fee3:c3ff] has quit [Quit: horrowind1]
20151103 22:57:18-!- EliDupree [~quassel@idupree.com] has quit [Remote host closed the connection]
20151103 22:57:28-!- EliDupree [~quassel@idupree.com] has joined #wesnoth-dev
20151103 22:57:49-!- Shackra [~Jorge@186.177.2.148] has joined #wesnoth-dev
20151103 23:14:44-!- joet [~joet@host86-191-22-51.range86-191.btcentralplus.com] has quit [Ping timeout: 250 seconds]
20151103 23:49:45-!- joet [~joet@host86-191-22-51.range86-191.btcentralplus.com] has joined #wesnoth-dev
20151103 23:57:01-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection]
20151103 23:59:03-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 250 seconds]
--- Log closed Wed Nov 04 00:00:42 2015